diff --git a/google-authenticator.spec b/google-authenticator.spec
index 53088eb..3642c87 100644
--- a/google-authenticator.spec
+++ b/google-authenticator.spec
@@ -1,32 +1,22 @@
-%global snapshot a096a62
-
 Name:           google-authenticator
-Version:        1.0
-Release:        0.git%{snapshot}%{?dist}.6
-Summary:        One-time passcode support using open standards
+Version:        1.03
+Release:        1%{?dist}
+Summary:        One-time pass-code support using open standards
 
-Group:          System Environment/Base
 License:        ASL 2.0
-URL:            http://code.google.com/p/google-authenticator/
-# git archive --format tgz \
-#     --prefix %{name}-%{version}-git%{snapshot}/ \
-#     -o %{name}-%{version}-git%{snapshot}.tar.gz %{snapshot}
-Source0:        %{name}-%{version}-git%{snapshot}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
+URL:            https://github.com/google/%{name}-libpam/
+Source0:        https://github.com/google/%{name}-libpam/archive/%{version}.zip
 BuildRequires:  pam-devel
-
-%if 0%{?fedora}
-BuildRequires:  qrencode-devel
-%endif
+BuildRequires:  automake
+BuildRequires:  libtool
 
 %description
-The Google Authenticator package contains a pluggable authentication
-module (PAM) which allows login using one-time passcodes conforming to
+The Google Authenticator package contains a plug-able authentication
+module (PAM) which allows login using one-time pass-codes conforming to
 the open standards developed by the Initiative for Open Authentication
 (OATH) (which is unrelated to OAuth).
 
-Passcode generators are available (separately) for several mobile
+Pass-code generators are available (separately) for several mobile
 platforms.
 
 These implementations support the HMAC-Based One-time Password (HOTP)
@@ -34,29 +24,34 @@ algorithm specified in RFC 4226 and the Time-based One-time Password
 (TOTP) algorithm currently in draft.
 
 %prep
-%setup -q -n %{name}-%{version}-git%{snapshot}
+%setup -q -n %{name}-libpam-%{version}
 
 %build
-cd libpam
-make CFLAGS="${CFLAGS:-%optflags}" LDFLAGS=-ldl %{?_smp_mflags}
+./bootstrap.sh
+%configure
+make %{?_smp_mflags}
 
 %check
-# (cd libpam && ./pam_google_authenticator_unittest)
+make check
 
 %install
-rm -rf $RPM_BUILD_ROOT
-cd libpam
-mkdir -p $RPM_BUILD_ROOT/%{_lib}/security
-install -m0755 pam_google_authenticator.so $RPM_BUILD_ROOT/%{_lib}/security/pam_google_authenticator.so
-mkdir -p $RPM_BUILD_ROOT/%{_bindir}
-install -m0755 google-authenticator $RPM_BUILD_ROOT/%{_bindir}/google-authenticator
+%make_install
 
 %files
-/%{_lib}/security/*
-%{_bindir}/google-authenticator
-%doc libpam/FILEFORMAT libpam/README libpam/totp.html
+/%{_usr}/%{_lib}/security/*
+%{_bindir}/%{name}
+%docdir %{_docdir}/%{name}
+%doc README.md
+%doc FILEFORMAT
+%doc CONTRIBUTING.md
+%license LICENSE
+%{_docdir}/%{name}/*
+
 
 %changelog
+* Tue Feb 07 2017 Marcel Haerry <mh+fedora@scrit.ch> - 1.03-1
+- Bump to latest version
+
 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-0.gita096a62.6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
@@ -90,3 +85,4 @@ install -m0755 google-authenticator $RPM_BUILD_ROOT/%{_bindir}/google-authentica
 
 * Mon Sep 12 2011 David Woodhouse <David.Woodhouse@intel.com> - 0-0.1.20110830.hgd525a9bab875
 - Initial import
+