diff --git a/.gitignore b/.gitignore
index 06a32b9..5d3f45a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 binclock_0.3.2-1.tar.gz
+/v0.4.0.tar.gz
diff --git a/binclock.spec b/binclock.spec
index abcef73..99346a5 100644
--- a/binclock.spec
+++ b/binclock.spec
@@ -1,64 +1,39 @@
 Name:           binclock
 Summary:        Fullscreen console binary clock
-Version:        0.3.2
-Release:        12%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}
 License:        GPLv2
-Group:          Applications/Text
-URL:            http://binclock.sourceforge.net
-
-Source0:        http://prdownloads.sourceforge.net/%{name}/%{name}_%{version}-1.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+URL:            https://github.com/frenzymadness/%{name}
+Source0:        %{url}/archive/v%{version}.tar.gz
 
 BuildArch:      noarch
 
-BuildRequires:  python
-
-Requires:       python
+BuildRequires:  python3-devel
 
 %description
 Fullscreen console binary clock.
 Features:
 
-    * Written in Python (needs version 2 or later)
-    * Uses ncurses
-    * In color
-    * Proper SIGWINCH handling
-
+* Written in Python
+* Uses ncurses
+* In color
+* Proper SIGWINCH handling
 
 %prep
-#NONE
-
-%setup -q
-#NONE
-
-%build
-#NONE
+%autosetup
 
 %install
-#For sanity protection, nuke buildroot
-%{__rm} -rf %{buildroot}
-
-#get rid of the developers debian folder
-%{__rm} -rf debian
-
-#get rid of the Makefile as it is not needed
-%{__rm} -rf Makefile
-
-#move the file to get rid of extension, environment is known
-mv binclock.py binclock
-%{__rm} -rf *.py
-
 #Install the executable
-install -Dp -m0755 binclock %{buildroot}%{_bindir}/binclock
-
-%clean
-%{__rm} -rf %{buildroot}
+install -Dp -m0755 binclock.py %{buildroot}%{_bindir}/%{name}
 
 %files
-%defattr (-, root, root)
 %{_bindir}/binclock
 
 %changelog
+* Wed Aug 10 2016 Lumir Balhar <lbalhar@redhat.com> - 0.4.0-1
+- Source point to new upstream fork
+- Modernized specfile
+
 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.2-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
@@ -94,4 +69,4 @@ install -Dp -m0755 binclock %{buildroot}%{_bindir}/binclock
 - License has been altered, incorrect assumption previously taken from the sourceforge page.
 - Stylistic changes made to satisfy rpmlint warning
 * Wed Aug 20 2008 Adam Miller <maxamillion [AT] gmail.com> - 0.3.2-1
-- First packaging attempt
+- First packaging attempt
\ No newline at end of file
diff --git a/sources b/sources
index 1bc7e8b..a3fef6b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-aa8f1124d9aff7864a0d6d792a2aaea7  binclock_0.3.2-1.tar.gz
+41b01691617e74b08691a70b0191728a  v0.4.0.tar.gz