diff --git a/ptpd-2.3.0.tar.gz b/ptpd-2.3.0.tar.gz
deleted file mode 100644
index 3fd75cf..0000000
--- a/ptpd-2.3.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1a4e90496f004bfd91657ccc49209101dc25b787e540648c07c0973469f1d8f7
-size 785362
diff --git a/ptpd-2.3.1.tar.gz b/ptpd-2.3.1.tar.gz
new file mode 100644
index 0000000..20ad8eb
--- /dev/null
+++ b/ptpd-2.3.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:267ad61d09d97069acec5d4878dceda20d0ddbebd27557d80230847848cee6c2
+size 884161
diff --git a/ptpd.changes b/ptpd.changes
index 5608862..01b90bc 100644
--- a/ptpd.changes
+++ b/ptpd.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu May 12 19:33:35 UTC 2016 - mpluskal@suse.com
+
+- Update to 2.3.1
+  * see attached Changelog for full list of changes
+- Update project and download url
+- Small spec file cleanups
+
 -------------------------------------------------------------------
 Mon Jun  1 08:41:34 UTC 2015 - mpluskal@suse.com
 
diff --git a/ptpd.spec b/ptpd.spec
index 66a5256..8bc9124 100644
--- a/ptpd.spec
+++ b/ptpd.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package ptpd
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,13 +17,13 @@
 
 
 Name:           ptpd
-Version:        2.3.0
+Version:        2.3.1
 Release:        0
 Summary:        Implements the Precision Time protocol as defined by IEEE 1588 standard
 License:        BSD-3-Clause
 Group:          System/Daemons
-Url:            http://ptpd.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.gz
+Url:            https://github.com/ptpd/ptpd
+Source0:        https://github.com/ptpd/ptpd/archive/ptpd-%{version}.tar.gz
 Source1:        ptpd2.service
 Source2:        ptpd2.conf
 Source3:        conf.sysconfig.ptpd
@@ -58,17 +58,15 @@ be easy to port to other platforms.
 PTPd is free. Everyone is invited to use and contribute to PTPd.
 
 %prep
-%setup -q
-autoreconf -fiv
+%setup -q -n %{name}-%{name}-%{version}
 
 %build
+autoreconf -fiv
 %configure \
-    --enable-statistics \
-    --enable-ntpdc \
-    --enable-sigusr2=counters
+  --enable-statistics
 
 %install
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
+make %{?_smp_mflags} DESTDIR=%{buildroot} install
 install -D -m 644 %{SOURCE1} %{buildroot}/%{_unitdir}/%{name}2.service
 ln -sv %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}2
 install -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/%{name}2.conf
@@ -77,17 +75,6 @@ install -D -m 644 %{SOURCE3} %{buildroot}%{_localstatedir}/adm/fillup-templates/
 install -d %{buildroot}%{_localstatedir}/log
 touch %{buildroot}%{_localstatedir}/log/ptpd2_kernelclock.drift
 
-%files
-%defattr(-, root, root)
-%doc COPYRIGHT ChangeLog README
-%config %{_sysconfdir}/%{name}2.conf
-%{_sbindir}/*
-%{_mandir}/man8/*
-%{_mandir}/man5/*
-%{_libexecdir}/systemd/system/ptpd2.service
-%{_localstatedir}/adm/fillup-templates/*
-%config %ghost %{_localstatedir}/log/ptpd2_kernelclock.drift
-
 %pre
 %service_add_pre %{name}2.service
 
@@ -101,4 +88,16 @@ touch %{buildroot}%{_localstatedir}/log/ptpd2_kernelclock.drift
 %postun
 %service_del_postun %{name}2.service
 
+%files
+%defattr(-, root, root)
+%doc COPYRIGHT ChangeLog README
+%config %{_sysconfdir}/%{name}2.conf
+%{_sbindir}/*
+%{_mandir}/man8/*
+%{_mandir}/man5/*
+%{_datadir}/ptpd
+%{_libexecdir}/systemd/system/ptpd2.service
+%{_localstatedir}/adm/fillup-templates/*
+%config %ghost %{_localstatedir}/log/ptpd2_kernelclock.drift
+
 %changelog