diff --git a/ChangeLog b/ChangeLog
index 2f1d6f6ae7415f509af0433378ab986517a1d8ed..724874cd258bf495c235f0575c3f62dc8fcc0c49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,7 +6,11 @@ CVS code -
 	  (Donnie Berkholz, minor tweaks by DLR)
 - AUTHORS:
 	- Update for the 2.0 branch of nano. (DLR)
-- nano.spec.in, doc/faq.html:
+- nano.spec.in:
+	- Update links for the 2.0 branch of nano. (DLR)
+	- Update for newer RPM-based distributions. (DLR, adapted from
+	  the nano 1.3.12-1.1.spec file in Fedora Rawhide)
+- doc/faq.html:
 	- Update links for the 2.0 branch of nano. (DLR)
 - doc/nano.1, doc/nanorc.5, doc/rnano.1:
 	- Add minor wording fixes. (DLR)
diff --git a/nano.spec.in b/nano.spec.in
index 14ea8618764960c505de3ab0e1145657b67d49d6..8a34fc38984eb29444ba4a8e21acc0e6054f8ffb 100644
--- a/nano.spec.in
+++ b/nano.spec.in
@@ -1,32 +1,32 @@
 %define name	@PACKAGE@
-%define ver	@VERSION@
-%define rel	1
+%define version	@VERSION@
+%define release	1
 
 Summary	: Pico editor clone with enhancements
 Name		: %{name}
-Version		: %{ver}
-Release		: %{rel}
-Copyright	: GPL
-Group		: Console/Editors
+Version		: %{version}
+Release		: %{release}
+License		: GPL
+Group		: Applications/Editors
 URL		: http://www.nano-editor.org/
-Source		: http://www.nano-editor.org/dist/v2.0/%{name}-%{ver}.tar.gz
-BuildRoot	: /var/tmp/%{name}-buildroot
-Requires	: ncurses
+Source		: http://www.nano-editor.org/dist/v2.0/%{name}-%{version}.tar.gz
+BuildRoot	: %{_tmppath}/%{name}-%{version}-root
+BuildRequires	: autoconf, gettext-devel, groff, ncurses-devel
 
 %description
-GNU nano is a small and friendly text editor.  It aims to emulate the Pico
-text editor while also offering a few enhancements.
+GNU nano is a small and friendly text editor.  It aims to emulate the
+Pico text editor while also offering a few enhancements.
 
 %prep
 %setup -q
 
 %build
 %configure --enable-all
-make RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
+make
 
 %install
-rm -rf "$RPM_BUILD_ROOT"
-make DESTDIR="$RPM_BUILD_ROOT" install
+rm -rf %{buildroot}
+make DESTDIR="%{buildroot}" install
 
 %files
 %defattr(-,root,root)