diff --git a/Makefile.in b/Makefile.in
index 67ab99d..768c0a9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -175,13 +175,13 @@ bz2: $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2
 rpm: $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2
 ifneq ($(RPMBUILD),no)
 	@$(MKDIR) $(PWD)/$(TMPDIR)/rpmbuild
-	@TMPDIR=$(PWD)/$(TMPDIR)/rpmbuild rpmbuild -ta --clean $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2
+	@TMPDIR=$(PWD)/$(TMPDIR)/rpmbuild $(RPMBUILD) --define="_sourcedir $(PWD)" -ba --clean $(PACKAGE_TARNAME).spec
 	@rm -fr $(PWD)/$(TMPDIR)/rpmbuild
 endif
 
-srpm: $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz
+srpm: $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2
 ifneq ($(RPMBUILD),no)
-	@rpmbuild -ts $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz
+	@$(RPMBUILD) --define="_srcrpmdir $(PWD)" -bs $(PACKAGE_TARNAME).spec
 endif
 
 $(PACKAGE_NAME).po: $(TMPDIR)/$(PACKAGE_NAME).pot
@@ -202,7 +202,7 @@ pixmaps: src/pw3270/$(PACKAGE_NAME).png src/pw3270/$(PACKAGE_NAME)-logo.png
 
 $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar: clean pixmaps filelist
 	@rm -fr $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
-	@find src -name Makefile -exec rm -f {} \;
+#	@find src -name Makefile -exec rm -f {} \;
 	@$(MKDIR) $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
 	@cp *.m4 $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
 	@NOCONFIGURE=1 ./autogen.sh $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
diff --git a/pw3270.spec.in b/pw3270.spec.in
index 46b8dda..c337886 100644
--- a/pw3270.spec.in
+++ b/pw3270.spec.in
@@ -137,6 +137,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -f langfiles
 %defattr(-,root,root)
 %doc AUTHORS LICENSE
+%{_mandir}/*/*
 
 # Main application
 %dir %{_datadir}/@PACKAGE_NAME@
--
libgit2 0.21.2