diff --git a/CHANGELOG b/CHANGELOG
index 4135625..f005f0a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,7 +6,7 @@ Version ?.?.? (next)
 Version 0.3.6 (latest)
 + Fixed bug with duplicate OIDs in dns.schema from partially applied patch
 + Renamed schema file to ldap2dns.schema
-+ Updated RPM specfile (UNTESTED, may need editing)
++ Updated RPM specfile
 + Removed already merged patchfiles
 + Restructured file layout, created doc directory
 + Deprecated unfinished webadmin work.  Will be replaced with Beatnik
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 0000000..9049649
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,22 @@
+Make sure you have the OpenLDAP version 2 include files installed.
+
+For Red Hat, this would be the openldap-devel package
+for SuSE, this would be the openldap2-devel package
+
+Type "make" in the current directory.  If all goes well follow up with a 
+"make install"
+
+To create an RPM, use one of the following commands:
+
+sudo make DISTRIBUTION=redhat rpm
+sudo make DISTRIBUTION=suse rpm
+
+if you are running Red Hat or SuSE respectively.
+
+For updates and changes see http://projects.alkaloid.net
+
+Please send any problem or success reports to the maintainer.
+
+-- 
+Ben Klang <ben@alkaloid.net>
+Alkaloid Networks
diff --git a/Makefile b/Makefile
index 0758083..dc074b3 100644
--- a/Makefile
+++ b/Makefile
@@ -13,6 +13,19 @@ LDAPCONFDIR=$(INSTALL_PREFIX)/etc/openldap
 SPECFILE=ldap2dns.spec
 DISTRIBUTION=redhat
 
+ifeq "$(DISTRIBUTION)" "redhat"
+RPMBASE=/usr/src/redhat
+RPMGROUP=Daemons/DNS
+OPENLDAPPKG=openldap
+endif
+
+ifeq "$(DISTRIBUTION)" "suse"
+RPMBASE=/usr/src/packages
+RPMGROUP=Productivity/Networking/DNS/Servers
+OPENLDAPPKG=openldap2
+endif
+
+
 all: ldap2dns ldap2dnsd
 
 debug: ldap2dns-dbg
@@ -51,21 +64,11 @@ tar: clean
 	cd ldap2dns
 
 rpm: tar
-ifeq "$(DISTRIBUTION)" "redhat"
-	RPMBASE=/usr/src/redhat
-	RPMGROUP=Daemons/DNS
-endif
-
-ifeq "$(DISTRIBUTION)" "suse"
-	RPMBASE=/usr/src/packages
-	RPMGROUP=Productivity/Networking/DNS/Servers
-endif
-
-
 	sed -e 's#%VERSION%#$(VERSION)#g' \
 	    -e 's#%RELEASE%#$(RELEASE)#g' \
 		-e 's#%RPMGROUP%#$(RPMGROUP)#g' \
+		-e 's#%OPENLDAPPKG%#$(OPENLDAPPKG)#g' \
 	    < $(SPECFILE).in > $(SPECFILE)
 		
-	mv ../ldap2dns-$(VERSION).tar.gz $(RPMBASE)
+	mv ../ldap2dns-$(VERSION).tar.gz $(RPMBASE)/SOURCES
 	rpmbuild -ba $(SPECFILE)
diff --git a/Specfile b/ldap2dns.spec.in
similarity index 94%
rename from Specfile
rename to ldap2dns.spec.in
index f1afb7d..609581c 100644
--- a/Specfile
+++ b/ldap2dns.spec.in
@@ -9,8 +9,8 @@
 #
 
 # norootforbuild
-# neededforbuild  openldap-devel
-BuildRequires: openldap-devel
+# neededforbuild  %OPENLDAPPKG%-devel
+BuildRequires: %OPENLDAPPKG%-devel
 
 Summary:	LDAP to DNS gateway
 Packager:	Ben Klang <ben@alkaloid.net>
@@ -22,6 +22,7 @@ License:	GPL
 Group:		%RPMGROUP%
 Source:		ldap2dns-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-build
+Autoreqprov:	 on
 
 %description
 ldap2dns is a program to create DNS records directly from an LDAP database. It
@@ -36,6 +37,7 @@ interfering with the DNS server.
 ldap2dns is designed to write the text data files used by tinydns, but also
 may be used to write zone files used by Bind.
 
+%debugpackage
 %prep
 %setup
 
@@ -64,4 +66,3 @@ make INSTALL_PREFIX=$RPM_BUILD_ROOT install
 - Updated Specfile to version 0.3.6
 * Wed Dec 06 2000 Jacob Rief <jacob.rief@tiscover.com>
 - initial revision for version 0.2.0
-