diff --git a/.gitignore b/.gitignore
index f8057e6..879aedd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /osc-0.132.4.tar.gz
 /osc-0.140.1.tar.gz
 /osc-0.151.1.tar.gz
+/osc-0.154.0.tar.gz
diff --git a/osc.spec b/osc.spec
index faa293b..5b2eb32 100644
--- a/osc.spec
+++ b/osc.spec
@@ -1,17 +1,17 @@
+# SUSE guys use OBS to automatically handle release numbers,
+# when rebasing check what they are using on
+# http://download.opensuse.org/repositories/openSUSE:/Tools/Fedora_24/
+# update the obsrel to match the upstream release number
+%global obsrel 187.1
+
 Name:           osc
-Version:        0.151.1
-# suse guys use weird release numbers, jus follow them
-# when rebasing check what they are using
-# http://download.opensuse.org/repositories/openSUSE:/Tools/Fedora_21/
-# and add .1 so we are one level up from upstream
-Release:        166.2.1%{?dist}
+Version:        0.154.0
+# Bump the release as necessary to ensure we're one level up from upstream
+Release:        %{obsrel}.1%{?dist}
 Group:          Development/Tools
 License:        GPLv2+
 Url:            https://github.com/openSUSE/osc
-# git clone git@github.com:openSUSE/osc.git
-# git reset --hard 0.151.1
-# git archive --prefix="osc-0.151.1/" --format=tar 0.151.1| gzip > osc-0.151.1.tar.gz
-Source:         osc-%{version}.tar.gz
+Source:         https://github.com/openSUSE/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
 Summary:        The openSUSE Build Service Commander
 BuildArch:      noarch
 
@@ -22,9 +22,12 @@ Requires:       rpm-python
 Requires:       m2crypto
 Requires:       python-lxml
 Requires:       python-urlgrabber
-Requires:       fuse-python
 
+%if 0%{?fedora} || 0%{?rhel} >= 8
 Recommends:     osc-source_validator
+%else
+Requires:       osc-source_validator
+%endif
 
 %description
 Commandline client for the openSUSE Build Service.
@@ -42,11 +45,12 @@ iconv -f ISO8859-1 -t UTF-8 -o TODO.new TODO
 mv TODO.new TODO
 
 %build
-CFLAGS="%{optflags}" %{__python} setup.py build
+%py2_build
 
 %install
-%{__python} setup.py install -O1 --prefix=%{_prefix} --root %{buildroot}
-%__ln_s osc-wrapper.py %{buildroot}/%{_bindir}/osc
+%py2_install
+
+%__ln_s osc-wrapper.py %{buildroot}%{_bindir}/osc
 %__mkdir_p %{buildroot}%{_localstatedir}/lib/osc-plugins
 %__mkdir_p %{buildroot}%{_datadir}/bash-completion/completions/
 install -Dm0644 dist/complete.csh %{buildroot}%{_sysconfdir}/profile.d/osc.csh
@@ -65,6 +69,10 @@ install -Dm0755 dist/osc.complete %{buildroot}%{_datadir}/osc/complete
 %{_datadir}/osc
 
 %changelog
+* Tue Jul 26 2016 Neal Gompa <ngompa13@gmail.com> - 0.154.0-187.1.1
+- Rebase to 0.154.0
+- Setup for working on EL7
+
 * Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.151.1-166.2.1
 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
 
diff --git a/sources b/sources
index 9b2fd80..043ed63 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2c7c8cd1e4f9f3c829e1afb1d1fc4275  osc-0.151.1.tar.gz
+6034cfa54e2c49fc22502a4326ce40cf  osc-0.154.0.tar.gz