diff --git a/ChangeLog b/ChangeLog
index 8ea4b5ab2..716e0846a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@
    - [rsa.c] bugfix: use correct size for memset()
    - [sshconnect.c] warn if announced size of modulus 'n' != real size
  - Added GNOME passphrase requestor (use --with-gnome-askpass)
+ - RPM build now creates subpackages
 
 19991108
  - Removed debian/ directory. This is now being maintained separately.
diff --git a/openssh.spec b/openssh.spec
index 888908a51..6b81b2724 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -8,6 +8,16 @@ Copyright: BSD
 Group: Applications/Internet
 BuildRoot: /tmp/openssh-%{version}-buildroot
 
+%package server
+Summary: Secure Shell protocol server (sshd)
+Requires: openssh chkconfig >= 0.9
+Group: System Environment/Daemons
+
+%package askpass
+Summary: GNOME passphrase dialog
+Group: Applications/Internet
+Requires: openssh
+
 %description
 Ssh (Secure Shell) a program for logging into a remote machine and for
 executing commands in a remote machine.  It is intended to replace
@@ -19,9 +29,41 @@ OpenSSH is OpenBSD's rework of the last free version of SSH, bringing it
 up to date in terms of security and features, as well as removing all 
 patented algorithms to seperate libraries (OpenSSL).
 
+This package includes the clients necessary to make encrypted connections
+to SSH servers.
+
+%description server
+Ssh (Secure Shell) a program for logging into a remote machine and for
+executing commands in a remote machine.  It is intended to replace
+rlogin and rsh, and provide secure encrypted communications between
+two untrusted hosts over an insecure network.  X11 connections and
+arbitrary TCP/IP ports can also be forwarded over the secure channel.
+
+OpenSSH is OpenBSD's rework of the last free version of SSH, bringing it
+up to date in terms of security and features, as well as removing all 
+patented algorithms to seperate libraries (OpenSSL).
+
+This package contains the secure shell daemon and its documentation.
+The sshd is the server part of the secure shell protocol and allows
+ssh clients to connect to your host.
+
+%description askpass
+Ssh (Secure Shell) a program for logging into a remote machine and for
+executing commands in a remote machine.  It is intended to replace
+rlogin and rsh, and provide secure encrypted communications between
+two untrusted hosts over an insecure network.  X11 connections and
+arbitrary TCP/IP ports can also be forwarded over the secure channel.
+
+OpenSSH is OpenBSD's rework of the last free version of SSH, bringing it
+up to date in terms of security and features, as well as removing all 
+patented algorithms to seperate libraries (OpenSSL).
+
+This package contains the GNOME passphrase dialog.
+
 %changelog
 * Tue Nov 09 1999 Damien Miller <djm@ibs.com.au>
 - Use make install
+- Subpackages
 * Mon Nov 08 1999 Damien Miller <djm@ibs.com.au>
 - Added links for slogin
 - Fixed perms on manpages
@@ -61,7 +103,7 @@ install -m600 sshd_config $RPM_BUILD_ROOT/etc/ssh/sshd_config
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
+%post server
 /sbin/chkconfig --add sshd
 if [ ! -f /etc/ssh/ssh_host_key -o ! -s /etc/ssh/ssh_host_key ]; then
 	/usr/bin/ssh-keygen -b 1024 -f /etc/ssh/ssh_host_key -N '' >&2
@@ -71,7 +113,7 @@ then
 	/etc/rc.d/init.d/sshd restart >&2
 fi
 
-%preun
+%preun server
 if [ "$1" = 0 ]
 then
 	/etc/rc.d/init.d/sshd stop >&2
@@ -82,25 +124,28 @@ fi
 %defattr(-,root,root)
 %doc COPYING.Ylonen ChangeLog ChangeLog.Ylonen OVERVIEW 
 %doc README README.Ylonen
-%attr(0755,root,root) /usr/sbin/sshd
 %attr(0755,root,root) /usr/bin/ssh
 %attr(0755,root,root) /usr/bin/ssh-agent
 %attr(0755,root,root) /usr/bin/ssh-keygen
 %attr(0755,root,root) /usr/bin/ssh-add
 %attr(0755,root,root) /usr/bin/scp
 %attr(0755,root,root) /usr/bin/slogin
-%attr(0755,root,root) /usr/lib/ssh/ssh-askpass
-
-%attr(0644,root,root) /usr/man/man8/sshd.8
 %attr(0644,root,root) /usr/man/man1/ssh.1
 %attr(0644,root,root) /usr/man/man1/ssh-agent.1
 %attr(0644,root,root) /usr/man/man1/ssh-keygen.1
 %attr(0644,root,root) /usr/man/man1/ssh-add.1
 %attr(0644,root,root) /usr/man/man1/scp.1
 %attr(0644,root,root) /usr/man/man1/slogin.1
+%attr(0644,root,root) %config /etc/ssh/ssh_config
 
+%files server
+%defattr(-,root,root)
+%attr(0755,root,root) /usr/sbin/sshd
+%attr(0644,root,root) /usr/man/man8/sshd.8
 %attr(0600,root,root) %config /etc/ssh/sshd_config
 %attr(0600,root,root) %config /etc/pam.d/sshd
 %attr(0755,root,root) %config /etc/rc.d/init.d/sshd
-%attr(0644,root,root) %config /etc/ssh/ssh_config
 
+%files askpass
+%defattr(-,root,root)
+%attr(0755,root,root) /usr/lib/ssh/ssh-askpass