diff --git a/Makefile.am b/Makefile.am
index 3b7ec105..a5552932 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,6 +6,7 @@ VDEPTH = ./$(VPATH)
 SUBDIRS =					\
 	lib						\
 	cmd						\
+	dist					\
 	$(NULL)
 
 EXTRA_DIST =				\
diff --git a/configure.in b/configure.in
index 4cbb590a..1bd1fdd6 100644
--- a/configure.in
+++ b/configure.in
@@ -80,5 +80,8 @@ lib/server/Makefile
 cmd/Makefile
 cmd/synergy/Makefile
 cmd/synergyd/Makefile
+dist/Makefile
+dist/rpm/Makefile
+dist/rpm/synergy.spec
 ])
 
diff --git a/dist/Makefile.am b/dist/Makefile.am
new file mode 100644
index 00000000..75079e4b
--- /dev/null
+++ b/dist/Makefile.am
@@ -0,0 +1,15 @@
+## Process this file with automake to produce Makefile.in
+NULL =
+DEPTH = ..
+VDEPTH = ./$(VPATH)/$(DEPTH)
+
+SUBDIRS =					\
+	rpm						\
+	$(NULL)
+
+EXTRA_DIST =				\
+	$(NULL)
+
+MAINTAINERCLEANFILES =		\
+	Makefile.in				\
+	$(NULL)
diff --git a/dist/rpm/Makefile.am b/dist/rpm/Makefile.am
new file mode 100644
index 00000000..b6716d33
--- /dev/null
+++ b/dist/rpm/Makefile.am
@@ -0,0 +1,11 @@
+## Process this file with automake to produce Makefile.in
+NULL =
+DEPTH = ../..
+VDEPTH = ./$(VPATH)/$(DEPTH)
+
+EXTRA_DIST =				\
+	$(NULL)
+
+MAINTAINERCLEANFILES =		\
+	Makefile.in				\
+	$(NULL)
diff --git a/dist/rpm/synergy.spec.in b/dist/rpm/synergy.spec.in
new file mode 100644
index 00000000..d7e7a4ad
--- /dev/null
+++ b/dist/rpm/synergy.spec.in
@@ -0,0 +1,37 @@
+Summary:   Mouse and keyboard sharing utility
+Name:      @PACKAGE@
+Version:   @VERSION@
+Release:   1
+Copyright: Copyright (C) 2002 Chris Schoeneman
+Packager:  Chris Schoeneman <crs23@bigfoot.com>
+Group:     FIXME
+Prefixes:  FIXME
+Source:    @PACKAGE@-@VERSION@.tar.gz
+URL:       FIXME
+BuildRoot: /var/tmp/@PACKAGE@-@VERSION@-root
+
+%description
+FIXME
+
+%prep
+%setup
+CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr
+
+%build
+make
+
+%install
+# FIXME -- install should install doc files
+make install DESTDIR=$RPM_BUILD_ROOT
+# FIXME -- or maybe: make PREFIX=$RPM_BUILD_ROOT%{prefix} install
+
+strip $RPM_BUILD_ROOT/usr/bin/synergy
+strip $RPM_BUILD_ROOT/usr/bin/synergyd
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%attr(755, root, root) /usr/bin/synergy
+%attr(755, root, root) /usr/bin/synergyd
+# FIXME -- add doc files