diff --git a/AUTHORS b/AUTHORS
index 5cc9c295..cab5ceeb 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,5 +1,7 @@
-Program: gpgme
-Maintainer: wk@g10gnupg.org
+Package: gpgme
+Maintainer: Markus Brinkmann <marcus@g10code.com>
+Bug reports: bug-gpgme@gnupg.org
+Security related bug reports: security@gnupg.org
 
 
 FSF <gnu@gnu.org>
@@ -11,8 +13,11 @@ g10 Code GmbH <code@g10code.com>
 Werner Koch <wk@gnupg.org>
  - Design and most stuff.
 
+Wojciech Polak <polak@lodz.pdi.net>
+ - gpgme.spec
 
- Copyright 2001 g10 Code GmbH
+
+ Copyright 2001, 2002 g10 Code GmbH
 
  This file is free software; as a special exception the author gives
  unlimited permission to copy and/or distribute it, with or without
diff --git a/ChangeLog b/ChangeLog
index dc42deae..2d918f5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2002-07-02  Werner Koch  <wk@gnupg.org>
+
+	* configure.ac: Bumbed version number to 0.3.9; add a comment on
+	when to change it.
+
+	* gpgme.spec.in: New. Contributed by Wojciech Polak.
+	* Makefile.am (dist-hook): New.
+
+	* AUTHORS: Added Wojciech and bug reporting addresses.
+
 2002-06-25  Werner Koch  <wk@gnupg.org>
 
 	Released 0.3.8.
diff --git a/Makefile.am b/Makefile.am
index 5ed1b623..0bf354d0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -52,3 +52,11 @@ gpgmeplug =
 endif
 
 SUBDIRS = ${assuan} jnlib gpgme ${tests} doc ${bonobo} ${complus} ${gpgmeplug}
+
+# Fix the version of the spec file and create a file named VERSION 
+# to be used for patch's Prereq: feature.
+dist-hook:
+	@set -e; \
+	sed -e 's/@pkg_version@/$(VERSION)/g' \
+	    $(top_srcdir)/gpgme.spec.in  > $(distdir)/gpgme.spec
+	echo "$(VERSION)" > $(distdir)/VERSION
diff --git a/NEWS b/NEWS
index 6b4aa1a5..ba705942 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
-Noteworthy changes in version CVS-HEAD
+Noteworthy changes in version 0.3.9 (unreleased)
 ------------------------------------------------
 
+ * A spec file for for creating RPMs has been added.
+
  * Interface changes relative to the 0.3.8 release:
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/configure.ac b/configure.ac
index c01d93f9..aa0b21df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,13 +20,14 @@
  
 # (Process this file with autoconf to produce a configure script.)
 
-# Version numbers (Remember to change them just before a release.)
+# Version number: Remember to change it immediately *after* a release.
+AC_INIT(gpgme, 0.3.9, [bug-gpgme@gnupg.org])
+# LT Version numbers, remember to change them just *before* a release.
 #   (Code changed:			REVISION++)
 #   (Interfaces added/removed/changed:	CURRENT++, REVISION=0)
 #   (Interfaces added:			AGE++)
 #   (Interfaces removed:		AGE=0)
 #
-AC_INIT(gpgme, 0.3.8a, [gnupg-devel@gnupg.org])
 LIBGPGME_LT_CURRENT=9
 LIBGPGME_LT_AGE=3
 LIBGPGME_LT_REVISION=0
diff --git a/gpgme.spec.in b/gpgme.spec.in
new file mode 100644
index 00000000..91dc1ce7
--- /dev/null
+++ b/gpgme.spec.in
@@ -0,0 +1,64 @@
+# This is a template.  The dist target uses it to create the real file.
+Summary: GPGME - GnuPG Made Easy
+Name: gpgme
+Version: @pkg_version@
+Release: 1
+URL: http://www.gnupg.org/gpgme.html
+Source: ftp://ftp.gnupg.org/gcrypt/alpha/gpgme/%{name}-%{version}.tar.gz
+Group: Development/Libraries
+Copyright: GPL
+BuildRoot: %{_tmppath}/%{name}-%{version}
+BuildRequires: make
+Prereq: /sbin/ldconfig /sbin/install-info
+Requires: gnupg
+
+%description
+GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG easier
+for applications. It provides a High-Level Crypto API for encryption,
+decryption, signing, signature verification and key management.
+
+%prep
+%setup -q
+
+%build
+CFLAGS="$RPM_OPT_FLAGS"; export CFLAGS
+./configure --prefix=/usr
+make
+
+%install
+rm -fr $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT
+make install prefix=$RPM_BUILD_ROOT/usr infodir=$RPM_BUILD_ROOT%{_infodir}
+
+%clean
+rm -fr $RPM_BUILD_ROOT
+make distclean
+
+%post
+/sbin/ldconfig
+/sbin/install-info %{_infodir}/gpgme.info.gz %{_infodir}/dir
+
+%preun
+if [ "$1" = 0 ]; then
+ /sbin/install-info --delete %{_infodir}/gpgme.info.gz %{_infodir}/dir
+fi
+
+%postun
+/sbin/ldconfig
+
+%files
+%defattr(-,root,root)
+%doc COPYING AUTHORS README INSTALL NEWS ChangeLog TODO THANKS
+%attr(0755,root,root) %{_bindir}/gpgme-config
+%attr(0755,root,root) %{_libdir}/*gpgme.so*
+%attr(0755,root,root) %{_libdir}/*gpgme.la
+%attr(0644,root,root) %{_libdir}/*gpgme.a
+%{_includedir}/gpgme.h
+%{_datadir}/aclocal/gpgme.m4
+%{_infodir}/gpgme.info*
+
+%changelog
+* Mon Jul 01 2002 Wojciech Polak <ghostface@lodz.pdi.net>
+- initial specfile release for GPGME.
+
+# EOF