diff --git a/configure.ac b/configure.ac
index 8dc719852a..93e8895e29 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2599,6 +2599,7 @@ hw/xnest/man/Makefile
 hw/xwin/Makefile
 hw/xwin/glx/Makefile
 hw/xwin/man/Makefile
+hw/xwin/winclipboard/Makefile
 hw/xquartz/Makefile
 hw/xquartz/GL/Makefile
 hw/xquartz/bundle/Makefile
diff --git a/hw/xwin/Makefile.am b/hw/xwin/Makefile.am
index 326ffa03d3..2c7fde3132 100644
--- a/hw/xwin/Makefile.am
+++ b/hw/xwin/Makefile.am
@@ -3,12 +3,9 @@ bin_PROGRAMS = XWin
 if XWIN_CLIPBOARD
 SRCS_CLIPBOARD = \
 	winclipboardinit.c \
-	winclipboardtextconv.c \
-	winclipboardthread.c \
-	winclipboardwndproc.c \
-	winclipboardwrappers.c \
-	winclipboardxevents.c
+	winclipboardwrappers.c
 DEFS_CLIPBOARD = -DXWIN_CLIPBOARD
+CLIPBOARD_LIBS = $(top_builddir)/hw/xwin/winclipboard/libXWinclipboard.la
 endif
 
 if XWIN_GLX_WINDOWS
@@ -110,7 +107,6 @@ SRCS =	InitInput.c \
 	winwindow.c \
 	winwndproc.c \
 	ddraw.h \
-	winclipboard.h \
 	winconfig.h \
 	win.h \
 	winglobals.h \
@@ -162,12 +158,15 @@ XWin_DEPENDENCIES = \
 	$(MULTIWINDOWEXTWM_LIBS) \
 	$(XWIN_GLX_LIBS) \
 	$(XWIN_LIBS) \
+	$(CLIPBOARD_LIBS) \
 	$(XSERVER_LIBS)
 
+
 XWin_LDADD = \
 	$(MULTIWINDOWEXTWM_LIBS) \
 	$(XWIN_GLX_LIBS) \
 	$(XWIN_LIBS) \
+	$(CLIPBOARD_LIBS) \
 	$(XSERVER_LIBS) \
 	$(XWIN_GLX_SYS_LIBS) \
 	$(XSERVER_SYS_LIBS) \
@@ -210,5 +209,5 @@ EXTRA_DIST = \
 relink:
 	$(AM_V_at)rm -f XWin$(EXEEXT) && $(MAKE) XWin$(EXEEXT)
 
-SUBDIRS = man $(GLX_DIR) .
-DIST_SUBDIRS = man glx .
+SUBDIRS = man $(GLX_DIR) winclipboard .
+DIST_SUBDIRS = man glx winclipboard .
diff --git a/hw/xwin/winclipboard/Makefile.am b/hw/xwin/winclipboard/Makefile.am
new file mode 100644
index 0000000000..91cc11607e
--- /dev/null
+++ b/hw/xwin/winclipboard/Makefile.am
@@ -0,0 +1,15 @@
+noinst_LTLIBRARIES = libXWinclipboard.la
+
+libXWinclipboard_la_SOURCES = \
+	winclipboard.h \
+	textconv.c \
+	thread.c \
+	wndproc.c \
+	xevents.c
+
+libXWinclipboard_la_CFLAGS = -DHAVE_XWIN_CONFIG_H \
+			     $(DIX_CFLAGS) \
+			     $(XWINMODULES_CFLAGS) \
+		             -I$(top_srcdir) -I$(top_srcdir)/miext/rootless -I$(srcdir)/..
+
+libXWinclipboard_la_LDFLAGS = -static -no-undefined
diff --git a/hw/xwin/winclipboardtextconv.c b/hw/xwin/winclipboard/textconv.c
similarity index 100%
rename from hw/xwin/winclipboardtextconv.c
rename to hw/xwin/winclipboard/textconv.c
diff --git a/hw/xwin/winclipboardthread.c b/hw/xwin/winclipboard/thread.c
similarity index 99%
rename from hw/xwin/winclipboardthread.c
rename to hw/xwin/winclipboard/thread.c
index 2641e20996..9ec61f8f54 100644
--- a/hw/xwin/winclipboardthread.c
+++ b/hw/xwin/winclipboard/thread.c
@@ -265,7 +265,7 @@ winClipboardProc(char *szDisplay)
     }
 
     /* Pre-flush X events */
-    /* 
+    /*
      * NOTE: Apparently you'll freeze if you don't do this,
      *       because there may be events in local data structures
      *       already.
diff --git a/hw/xwin/winclipboard.h b/hw/xwin/winclipboard/winclipboard.h
similarity index 99%
rename from hw/xwin/winclipboard.h
rename to hw/xwin/winclipboard/winclipboard.h
index 41c0a538ba..58e35dc75a 100644
--- a/hw/xwin/winclipboard.h
+++ b/hw/xwin/winclipboard/winclipboard.h
@@ -1,5 +1,3 @@
-#ifndef _WINCLIPBOARD_H_
-#define _WINCLIPBOARD_H_
 /*
  *Copyright (C) 2003-2004 Harold L Hunt II All Rights Reserved.
  *
@@ -30,6 +28,9 @@
  * Authors:	Harold L Hunt II
  */
 
+#ifndef _WINCLIPBOARD_H_
+#define _WINCLIPBOARD_H_
+
 /* Standard library headers */
 #include <assert.h>
 #include <stdio.h>
diff --git a/hw/xwin/winclipboardwndproc.c b/hw/xwin/winclipboard/wndproc.c
similarity index 100%
rename from hw/xwin/winclipboardwndproc.c
rename to hw/xwin/winclipboard/wndproc.c
diff --git a/hw/xwin/winclipboardxevents.c b/hw/xwin/winclipboard/xevents.c
similarity index 100%
rename from hw/xwin/winclipboardxevents.c
rename to hw/xwin/winclipboard/xevents.c
diff --git a/hw/xwin/winclipboardinit.c b/hw/xwin/winclipboardinit.c
index d16c121c67..2e400f65b2 100644
--- a/hw/xwin/winclipboardinit.c
+++ b/hw/xwin/winclipboardinit.c
@@ -36,7 +36,7 @@
 #include <pthread.h>
 
 #include "os.h"
-#include "winclipboard.h"
+#include "winclipboard/winclipboard.h"
 #include "windisplay.h"
 
 #define WIN_CLIPBOARD_RETRIES			40