diff --git a/chrony.changes b/chrony.changes
index 89cfe67..0eedeff 100644
--- a/chrony.changes
+++ b/chrony.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jan 11 04:29:12 UTC 2013 - mrdocs@opensuse.org
+
+-run spec-cleaner on the spec file, fix license and remove cruft
+
 -------------------------------------------------------------------
 Tue Nov 29 13:55:16 UTC 2011 - aj@suse.de
 
diff --git a/chrony.spec b/chrony.spec
index 23c4d49..dd405fe 100644
--- a/chrony.spec
+++ b/chrony.spec
@@ -1,32 +1,34 @@
-# norootforbuild
+#
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
 
-Name:				 chrony
-Version:			 1.26
-Release:			 0
-Summary:			 System Clock Synchronization Client and Server
-# 
-Source:			 http://download.tuxfamily.org/chrony/chrony-%{version}.tar.gz
-Source1:			 chrony.init
-Source2:			 chrony.sysconfig
-Patch1:			 chrony-config.patch
-URL:				 http://chrony.tuxfamily.org/
-Group:			 Productivity/Networking/Other
-License:			 GNU General Public License version 2 or later (GPL v2 or later)
-BuildRoot:		 %{_tmppath}/build-%{name}-%{version}
-BuildRequires:	 texinfo 
-BuildRequires:	 readline-devel
-BuildRequires:	 libcap-devel
-BuildRequires:	 ncurses-devel
-BuildRequires:	 gcc make glibc-devel
-%if 0%{?suse_version} >= 1030 && 0%{?suse_version} <= 1140
-BuildRequires:  licenses
-Requires:       licenses
-%endif
-PreReq:			 %install_info_prereq
-PreReq:			 %fillup_prereq
-PreReq:			 %insserv_prereq
-PreReq:			 /usr/sbin/groupadd
-PreReq:			 /usr/sbin/useradd
+Name:           chrony
+Version:        1.26
+Release:        0
+License:        GPL-2.0+
+Summary:        System Clock Synchronization Client and Server
+Url:            http://chrony.tuxfamily.org/
+Group:          Productivity/Networking/Other
+Source:         http://download.tuxfamily.org/chrony/chrony-%{version}.tar.gz
+Source1:        chrony.init
+Source2:        chrony.sysconfig
+# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
+Patch1:         chrony-config.patch
+BuildRequires:  gcc
+BuildRequires:  glibc-devel
+BuildRequires:  libcap-devel
+BuildRequires:  make
+BuildRequires:  ncurses-devel
+BuildRequires:  readline-devel
+BuildRequires:  texinfo
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+
+
+Requires(pre):  %fillup_prereq
+Requires(pre):  %insserv_prereq
+Requires(pre):  %install_info_prereq
+Requires(pre):  /usr/sbin/groupadd
+Requires(pre):  /usr/sbin/useradd
 
 %description
 Chrony is a pair of programs which are used to maintain the accuracy of the
@@ -61,44 +63,44 @@ as the Chronyd instance it is controlling or a different computer.
 	 --mandir="%{_mandir}" \
 	 --docdir="%{_docdir}/%{name}"
 
-%__make %{?jobs:-j%{jobs}} \
-	 CC="%__cc" \
+make %{?_smp_mflags} \
+	 CC="gcc" \
 	 CFLAGS="%{optflags} -Wall" \
 	 prefix="%{_prefix}"
 
-%__make chrony.txt prefix="%{_prefix}"
-%__make chrony.info prefix="%{_prefix}"
+make chrony.txt prefix="%{_prefix}"
+make chrony.info prefix="%{_prefix}"
 
 %install
 %makeinstall
-%__rm -rf "%{buildroot}%{_docdir}/%{name}"
+rm -rf "%{buildroot}%{_docdir}/%{name}"
 
-%__install -d "%{buildroot}%{_infodir}"
-%__install -m0644 chrony.info "%{buildroot}%{_infodir}"/
+install -d "%{buildroot}%{_infodir}"
+install -m0644 chrony.info "%{buildroot}%{_infodir}"/
 
-%__install -D -m0755 "%{SOURCE1}" "%{buildroot}/etc/init.d/chronyd"
-%__install -d "%{buildroot}/usr/sbin"
-%__ln_s ../../etc/init.d/chronyd "%{buildroot}/usr/sbin/rcchronyd"
+install -D -m0755 "%{SOURCE1}" "%{buildroot}%{_initddir}/chronyd"
+install -d "%{buildroot}%{_prefix}/sbin"
+ln -s ../../etc/init.d/chronyd "%{buildroot}%{_sbindir}/rcchronyd"
 
-%__install -D -m0644 "%{SOURCE2}" "%{buildroot}%{_var}/adm/fillup-templates/sysconfig.chronyd"
+install -D -m0644 "%{SOURCE2}" "%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.chronyd"
 
-%__install -d "%{buildroot}%{_var}/lib/chrony"
-%__install -d "%{buildroot}%{_var}/log/chrony"
+install -d "%{buildroot}%{_localstatedir}/lib/chrony"
+install -d "%{buildroot}%{_localstatedir}/log/chrony"
 
 
 %if 0%{?suse_version} >= 1030 && 0%{?suse_version} <= 1140
 h=/usr/share/doc/licenses/md5/$(md5sum COPYING|cut -f1 -d" ")
-test -e "$h" && %__ln_s -f "$h" .
+test -e "$h" && ln -s -f "$h" .
 %endif
 
-%__install -d "%{buildroot}%{_sysconfdir}"
-%__install -m0644 examples/chrony.conf.example "%{buildroot}%{_sysconfdir}/chrony.conf"
-%__install -m0600 examples/chrony.keys.example "%{buildroot}%{_sysconfdir}/chrony.keys"
+install -d "%{buildroot}%{_sysconfdir}"
+install -m0644 examples/chrony.conf.example "%{buildroot}%{_sysconfdir}/chrony.conf"
+install -m0600 examples/chrony.keys.example "%{buildroot}%{_sysconfdir}/chrony.keys"
 rm examples/chrony.keys.example.orig
 
 %pre
 /usr/sbin/groupadd -r chrony || :
-/usr/sbin/useradd -r -g chrony -c "Chrony Daemon" -d "%{_var}/lib/chrony" chrony || :
+/usr/sbin/useradd -r -g chrony -c "Chrony Daemon" -d "%{_localstatedir}/lib/chrony" chrony || :
 
 %post
 %{fillup_only -an chronyd}
@@ -113,7 +115,7 @@ rm examples/chrony.keys.example.orig
 %install_info_delete --info-dir="%{_infodir}" "%{_infodir}/chrony.info%{ext_info}"
 
 %clean
-%__rm -rf "%{buildroot}"
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
@@ -128,15 +130,10 @@ rm examples/chrony.keys.example.orig
 %doc %{_mandir}/man5/chrony.conf.5%{ext_man}
 %doc %{_mandir}/man8/chronyd.8%{ext_man}
 %doc %{_infodir}/chrony.info%{ext_info}
-%config /etc/init.d/chronyd
-/usr/sbin/rcchronyd
-%{_var}/adm/fillup-templates/sysconfig.chronyd
-%attr(0750,chrony,chrony) %{_var}/lib/chrony
-%attr(0750,chrony,chrony) %{_var}/log/chrony
+%config %{_sysconfdir}/init.d/chronyd
+%{_sbindir}/rcchronyd
+%{_localstatedir}/adm/fillup-templates/sysconfig.chronyd
+%attr(0750,chrony,chrony) %{_localstatedir}/lib/chrony
+%attr(0750,chrony,chrony) %{_localstatedir}/log/chrony
 
 %changelog
-# vim: set sw=3 ts=3 noet:
-# Local Variables:
-# mode: rpm-spec
-# tab-width: 3
-# End: