diff --git a/Makefile.am b/Makefile.am
index ab3bf2b0..674b2d5a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,8 +2,14 @@
 NULL =
 DEPTH = .
 
-EXTRA_DIST =
-SUBDIRS =					\
-	lib						\
-	cmd						\
+EXTRA_DIST =					\
+	all.dsp						\
+	synergy.dsw					\
+	doc/doxygen.cfg				\
+	examples/synergy.conf		\
+	$(NULL)
+
+SUBDIRS =						\
+	lib							\
+	cmd							\
 	$(NULL)
diff --git a/cmd/synergy/Makefile.am b/cmd/synergy/Makefile.am
index 3b48a5a5..5eff699d 100644
--- a/cmd/synergy/Makefile.am
+++ b/cmd/synergy/Makefile.am
@@ -2,6 +2,12 @@
 NULL =
 DEPTH = ../..
 
+EXTRA_DIST =							\
+	synergy.dsp							\
+	synergy.rc							\
+	resource.h							\
+	$(NULL)
+
 bin_PROGRAMS = synergy
 synergy_SOURCES = 						\
 	synergy.cpp							\
diff --git a/cmd/synergyd/Makefile.am b/cmd/synergyd/Makefile.am
index e0a424b2..2593eb51 100644
--- a/cmd/synergyd/Makefile.am
+++ b/cmd/synergyd/Makefile.am
@@ -2,6 +2,12 @@
 NULL =
 DEPTH = ../..
 
+EXTRA_DIST =							\
+	synergyd.dsp						\
+	synergyd.rc							\
+	resource.h							\
+	$(NULL)
+
 bin_PROGRAMS = synergyd
 synergyd_SOURCES = 						\
 	synergyd.cpp						\
diff --git a/examples/synergy.linux.init b/examples/synergy.linux.init
deleted file mode 100755
index 9e143d8b..00000000
--- a/examples/synergy.linux.init
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/sh
-#
-# Startup script for synergy client
-#
-# chkconfig: 5 98 02
-# description: Starts/stops synergy client
-#
-# processname: synergy
-#
-### BEGIN INIT INFO
-# Provides:       synergy
-# Required-Start: $network $syslog
-# Required-Stop:  $network $syslog
-# Default-Start:  5
-# Default-Stop:   0 1 2 3 6
-# Description:    Start synergy client daemon.
-### END INIT INFO
-
-SYNERGY_BIN=/usr/sbin/synergy
-test -x $SYNERGY_BIN || exit 5
-
-# startup command line arguments
-ARGS=192.168.1.3
-
-# load function library
-if test -f /etc/rc.status; then
-. /etc/rc.status
-rc_reset
-else
-. /etc/rc.d/init.d/functions
-function startproc ()
-{
-	daemon $*
-}
-function checkproc ()
-{
-	status $*
-}
-function rc_status ()
-{
-	RETVAL=$?
-}
-function rc_exit ()
-{
-	exit $RETVAL
-}
-fi
-
-case "$1" in
-	start)
-		echo -n "Starting synergy client: "
-		startproc $SYNERGY_BIN $ARGS
-		rc_status -v
-		;;
-	stop)
-		echo -n "Stopping synergy client: "
-		killproc -TERM $SYNERGY_BIN
-		rc_status -v
-		;;
-	restart)
-		$0 stop
-		$0 start
-		rc_status
-		;;
-	status)
-		echo -n "Checking for synergy client: "
-		checkproc $SYNERGY_BIN
-		rc_status -v
-		;;
-	*)
-		echo "Usage: synergy {start|stop|status|restart}"
-		exit 1
-esac
-
-rc_exit
diff --git a/examples/synergyd.linux.init b/examples/synergyd.linux.init
deleted file mode 100755
index 426bcaa1..00000000
--- a/examples/synergyd.linux.init
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/sh
-#
-# Startup script for synergy server
-#
-# chkconfig: 5 98 02
-# description: Starts/stops synergy server
-#
-# processname: synergyd
-#
-### BEGIN INIT INFO
-# Provides:       synergyd
-# Required-Start: $network $syslog
-# Required-Stop:  $network $syslog
-# Default-Start:  5
-# Default-Stop:   0 1 2 3 6
-# Description:    Start synergy server daemon.
-### END INIT INFO
-
-SYNERGYD_BIN=/usr/sbin/synergyd
-test -x $SYNERGYD_BIN || exit 5
-
-# startup command line arguments
-ARGS=
-
-# load function library
-if test -f /etc/rc.status; then
-. /etc/rc.status
-rc_reset
-else
-. /etc/rc.d/init.d/functions
-function startproc ()
-{
-	daemon $*
-}
-function checkproc ()
-{
-	status $*
-}
-function rc_status ()
-{
-	RETVAL=$?
-}
-function rc_exit ()
-{
-	exit $RETVAL
-}
-fi
-
-case "$1" in
-	start)
-		echo -n "Starting synergy server: "
-		startproc $SYNERGYD_BIN $ARGS
-		rc_status -v
-		;;
-	stop)
-		echo -n "Stopping synergy server: "
-		killproc -TERM $SYNERGYD_BIN
-		rc_status -v
-		;;
-	restart)
-		$0 stop
-		$0 start
-		rc_status
-		;;
-	status)
-		echo -n "Checking for synergy server: "
-		checkproc $SYNERGYD_BIN
-		rc_status -v
-		;;
-	*)
-		echo "Usage: synergyd {start|stop|status|restart}"
-		exit 1
-esac
-
-rc_exit
diff --git a/lib/base/Makefile.am b/lib/base/Makefile.am
index 82f537e8..f52d5bf6 100644
--- a/lib/base/Makefile.am
+++ b/lib/base/Makefile.am
@@ -2,6 +2,10 @@
 NULL =
 DEPTH = ../..
 
+EXTRA_DIST =				\
+	base.dsp				\
+	$(NULL)
+
 noinst_LIBRARIES = libbase.a
 libbase_a_SOURCES =			\
 	CFunctionJob.cpp		\
diff --git a/lib/client/Makefile.am b/lib/client/Makefile.am
index c489709c..1801c61b 100644
--- a/lib/client/Makefile.am
+++ b/lib/client/Makefile.am
@@ -2,6 +2,12 @@
 NULL =
 DEPTH = ../..
 
+EXTRA_DIST =						\
+	client.dsp						\
+	CMSWindowsSecondaryScreen.cpp	\
+	CMSWindowsSecondaryScreen.h		\
+	$(NULL)
+
 noinst_LIBRARIES = libclient.a
 libclient_a_SOURCES = 				\
 	CClient.cpp						\
diff --git a/lib/http/Makefile.am b/lib/http/Makefile.am
index cee66bf8..07f4ad44 100644
--- a/lib/http/Makefile.am
+++ b/lib/http/Makefile.am
@@ -2,6 +2,10 @@
 NULL =
 DEPTH = ../..
 
+EXTRA_DIST =				\
+	http.dsp				\
+	$(NULL)
+
 noinst_LIBRARIES = libhttp.a
 libhttp_a_SOURCES = 		\
 	CHTTPProtocol.cpp		\
diff --git a/lib/io/Makefile.am b/lib/io/Makefile.am
index 6e134dfa..e244a402 100644
--- a/lib/io/Makefile.am
+++ b/lib/io/Makefile.am
@@ -2,6 +2,10 @@
 NULL =
 DEPTH = ../..
 
+EXTRA_DIST =				\
+	io.dsp					\
+	$(NULL)
+
 noinst_LIBRARIES = libio.a
 libio_a_SOURCES = 				\
 	CBufferedInputStream.cpp	\
diff --git a/lib/mt/Makefile.am b/lib/mt/Makefile.am
index a3c4b165..88e2c06c 100644
--- a/lib/mt/Makefile.am
+++ b/lib/mt/Makefile.am
@@ -2,6 +2,10 @@
 NULL =
 DEPTH = ../..
 
+EXTRA_DIST =				\
+	mt.dsp					\
+	$(NULL)
+
 noinst_LIBRARIES = libmt.a
 libmt_a_SOURCES = 			\
 	CLock.cpp				\
diff --git a/lib/net/Makefile.am b/lib/net/Makefile.am
index cc996705..dc9f1417 100644
--- a/lib/net/Makefile.am
+++ b/lib/net/Makefile.am
@@ -2,6 +2,10 @@
 NULL =
 DEPTH = ../..
 
+EXTRA_DIST =				\
+	net.dsp					\
+	$(NULL)
+
 noinst_LIBRARIES = libnet.a
 libnet_a_SOURCES = 			\
 	CNetwork.cpp			\
diff --git a/lib/platform/Makefile.am b/lib/platform/Makefile.am
index 516961c1..9cf62784 100644
--- a/lib/platform/Makefile.am
+++ b/lib/platform/Makefile.am
@@ -2,7 +2,29 @@
 NULL =
 DEPTH = ../..
 
-# FIXME -- add CUnixPlatform.cpp as an unbuilt source
+EXTRA_DIST =								\
+	makehook.dsp							\
+	platform.dsp							\
+	synrgyhk.dsp							\
+	CMSWindowsClipboard.cpp					\
+	CMSWindowsClipboardAnyTextConverter.cpp	\
+	CMSWindowsClipboardTextConverter.cpp	\
+	CMSWindowsClipboardUTF16Converter.cpp	\
+	CMSWindowsScreen.cpp					\
+	CMSWindowsScreenSaver.cpp				\
+	CSynergyHook.cpp						\
+	CWin32Platform.cpp						\
+	CMSWindowsClipboard.h					\
+	CMSWindowsClipboardAnyTextConverter.h	\
+	CMSWindowsClipboardTextConverter.h		\
+	CMSWindowsClipboardUTF16Converter.h		\
+	CMSWindowsScreen.h						\
+	CMSWindowsScreenSaver.h					\
+	CSynergyHook.h							\
+	CWin32Platform.h						\
+	IMSWindowsScreenEventHandler.h			\
+	$(NULL)
+
 noinst_LIBRARIES = libplatform.a
 libplatform_a_SOURCES = 					\
 	CPlatform.cpp							\
@@ -24,6 +46,9 @@ libplatform_a_SOURCES = 					\
 	CXWindowsUtil.h							\
 	IPlatform.h								\
 	$(NULL)
+EXTRA_libplatform_a_SOURCES =				\
+	CUnixPlatform.cpp						\
+	$(NULL)
 INCLUDES =									\
 	-I$(DEPTH)/lib/base 					\
 	-I$(DEPTH)/lib/mt	 					\
diff --git a/lib/server/Makefile.am b/lib/server/Makefile.am
index db86137b..d2f666f5 100644
--- a/lib/server/Makefile.am
+++ b/lib/server/Makefile.am
@@ -2,6 +2,12 @@
 NULL =
 DEPTH = ../..
 
+EXTRA_DIST =						\
+	server.dsp						\
+	CMSWindowsPrimaryScreen.cpp		\
+	CMSWindowsPrimaryScreen.h		\
+	$(NULL)
+
 noinst_LIBRARIES = libserver.a
 libserver_a_SOURCES = 				\
 	CClientProxy.cpp				\
diff --git a/lib/synergy/Makefile.am b/lib/synergy/Makefile.am
index de13e200..e52e7cfc 100644
--- a/lib/synergy/Makefile.am
+++ b/lib/synergy/Makefile.am
@@ -2,37 +2,41 @@
 NULL =
 DEPTH = ../..
 
+EXTRA_DIST =					\
+	libsynergy.dsp				\
+	$(NULL)
+
 noinst_LIBRARIES = libsynergy.a
-libsynergy_a_SOURCES = 		\
-	CInputPacketStream.cpp	\
-	COutputPacketStream.cpp	\
-	CProtocolUtil.cpp		\
-	CClipboard.cpp			\
-	XScreen.cpp				\
-	XSynergy.cpp			\
-	CClipboard.h			\
-	CInputPacketStream.h	\
-	COutputPacketStream.h	\
-	CProtocolUtil.h			\
-	ClipboardTypes.h		\
-	IClient.h				\
-	IClipboard.h			\
-	IPrimaryScreenReceiver.h\
-	IScreen.h				\
-	IScreenEventHandler.h	\
-	IScreenReceiver.h		\
-	IScreenSaver.h			\
-	IServer.h				\
-	KeyTypes.h				\
-	MouseTypes.h			\
-	ProtocolTypes.h			\
-	Version.h				\
-	XScreen.h				\
-	XSynergy.h				\
+libsynergy_a_SOURCES = 			\
+	CInputPacketStream.cpp		\
+	COutputPacketStream.cpp		\
+	CProtocolUtil.cpp			\
+	CClipboard.cpp				\
+	XScreen.cpp					\
+	XSynergy.cpp				\
+	CClipboard.h				\
+	CInputPacketStream.h		\
+	COutputPacketStream.h		\
+	CProtocolUtil.h				\
+	ClipboardTypes.h			\
+	IClient.h					\
+	IClipboard.h				\
+	IPrimaryScreenReceiver.h	\
+	IScreen.h					\
+	IScreenEventHandler.h		\
+	IScreenReceiver.h			\
+	IScreenSaver.h				\
+	IServer.h					\
+	KeyTypes.h					\
+	MouseTypes.h				\
+	ProtocolTypes.h				\
+	Version.h					\
+	XScreen.h					\
+	XSynergy.h					\
 	$(NULL)
-INCLUDES =					\
-	-I$(DEPTH)/lib/base 	\
-	-I$(DEPTH)/lib/mt	 	\
-	-I$(DEPTH)/lib/io	 	\
-	-I$(DEPTH)/lib/net	 	\
+INCLUDES =						\
+	-I$(DEPTH)/lib/base 		\
+	-I$(DEPTH)/lib/mt	 		\
+	-I$(DEPTH)/lib/io	 		\
+	-I$(DEPTH)/lib/net	 		\
 	$(NULL)
diff --git a/notes b/nodist/notes
similarity index 100%
rename from notes
rename to nodist/notes