diff --git a/.gitignore b/.gitignore
index 0342939..3f8074c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /pcsxr-87788.zip
+/pcsxr-7ce3857.tar.gz
diff --git a/pcsxr.spec b/pcsxr.spec
index 910e55e..1b097a1 100644
--- a/pcsxr.spec
+++ b/pcsxr.spec
@@ -1,46 +1,49 @@
-%global svnversion 87788
+%global commit 7ce3857e14aa0e6e00c52b918661933a2b2ecc39
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global gitdate 20181218
+%global fgittag %{gitdate}.git%{shortcommit}
 %undefine _hardened_build
 Name:           pcsxr
 Version:        1.9.94
-Release:        17%{?dist}
+Release:        18%{?fgittag:.%{fgittag}}%{?dist}
 Summary:        A plugin based PlayStation (PSX) emulator with high compatibility
 
-#All is GPLv2+ except:
+#All code is distributed as GPLv3+ except:
 # SOURCE/libpcsxcore/coff.h is BSD License (no advertising)
 # SOURCE/libpcsxcore/sjisfont.h is Public Domain
 # SOURCE/libpcsxcore/psemu_plugin_defs.h is Public Domain
-License:        GPLv2+ and BSD and Public Domain
-Url:            http://pcsxr.codeplex.com/
-#The source can be downloaded here (1.9.94 is a snapshot of svn 87788):
-#https://pcsxr.codeplex.com/downloads/get/756488
-Source0:        https://pcsxr.codeplex.com/downloads/get/756488#/%{name}-%{svnversion}.zip
+License:        GPLv3+ and BSD and Public Domain
+Url:            https://github.com/iCatButler/pcsxr
+Source0:        https://github.com/iCatButler/%{name}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
 #Appdata:
 Source1:        %{name}.appdata.xml
-#Missing include, bug filed upstream:
-#https://pcsxr.codeplex.com/workitem/12408
-Patch0:         %{name}-%{version}-missinginclude.patch
-#Fix for zlib 1.2.9+, backported from upstream PR:
-#https://pcsxr.codeplex.com/SourceControl/network/forks/mgorny/pcsxr/contribution/9061
-Patch1:         %{name}-%{version}-zlib129fix.patch
-#Submitted upstream in master:
-#https://pcsxr.codeplex.com/SourceControl/changeset/69e178589897f8f89cf52812537935134ed14fe4
-#https://pcsxr.codeplex.com/SourceControl/changeset/9f4f1ce8f87318b4503ecd0eb2763796b5505c6d
-Patch2:         %{name}-%{version}-SDLjoyoverflowbug.patch
 
+BuildRequires:  alsa-lib-devel
+BuildRequires:  pulseaudio-libs-devel
+BuildRequires:  atk-devel
 BuildRequires:  SDL2-devel
-BuildRequires:  gtk3-devel
-BuildRequires:  nasm
-BuildRequires:  mesa-libGL-devel
+BuildRequires:  cairo-devel
+BuildRequires:  cmake
+BuildRequires:  gcc
+BuildRequires:  gcc-c++
+BuildRequires:  gdk-pixbuf2-devel
 BuildRequires:  gettext
-BuildRequires:  libXv-devel
-BuildRequires:  libXtst-devel
-BuildRequires:  libcdio-devel
-BuildRequires:  intltool
 BuildRequires:  glib2-devel
-BuildRequires:  libtool
-BuildRequires:  autoconf
+BuildRequires:  glibc-devel
+BuildRequires:  gtk3-devel
+BuildRequires:  libarchive-devel
+BuildRequires:  libcdio-devel
+BuildRequires:  libXtst-devel
+BuildRequires:  libXv-devel
+BuildRequires:  mesa-libGL-devel
+BuildRequires:  nasm
+BuildRequires:  pango-devel
+
 BuildRequires:  desktop-file-utils
 BuildRequires:  libappstream-glib
+BuildRequires:  hicolor-icon-theme
+
+Requires:       hicolor-icon-theme
 
 #modified from debian files
 %description
@@ -50,45 +53,45 @@ emulation support for game pads, videos, sound, memory cards, and other
 important PSX components, and is able to play many games without problems.
 
 %prep
-%autosetup -p1 -n %{name}
+%autosetup -p1 -n %{name}-%{commit}
 #remove any unnecessary files:
 rm -f -r win32 macosx
+#Remove changes to c/cxx flags, upstream strips out debug symbols
+sed -i '/CMAKE_C.*_FLAGS/d' CMakeLists.txt
+#Remove cmake rule to install license, the license macro install it instead
+sed -i '/COPYING/d' doc/CMakeLists.txt
+#Add snapshot info into about dialog
+sed -i 's/"git"/"%{fgittag}"/' gui/AboutDlg.c
 
 %build
-sh autogen.sh
-%configure --enable-libcdio --enable-opengl
+%cmake . -DUSE_LIBCDIO:BOOL=ON -DUSE_LIBARCHIVE:BOOL=ON
 %make_build
 
 %install
 %make_install
-#Install desktop file
-desktop-file-install \
-  --remove-key=Encoding \
-  --dir %{buildroot}%{_datadir}/applications \
-  data/%{name}.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
 #Install appdata.xml and verify
 install -p -D -m 0644 %{SOURCE1} \
   %{buildroot}/%{_datadir}/appdata/%{name}.appdata.xml
 appstream-util validate-relax --nonet \
   %{buildroot}/%{_datadir}/appdata/*.appdata.xml
-#Remove static libraries
-find %{buildroot} -name '*.la' -exec rm -f {} ';'
 #Find locale
 %find_lang %{name}
 
 %files -f %{name}.lang
-%doc doc/keys.txt doc/tweaks.txt AUTHORS README
 %license COPYING
+%{_docdir}/%{name}
 %{_mandir}/man1/%{name}.1*
-%{_datadir}/%{name}
-%{_datadir}/pixmaps/%{name}-icon.png
-%{_datadir}/psemu
 %{_bindir}/%{name}
 %{_libdir}/games/psemu
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/appdata/*.appdata.xml
+%{_datadir}/icons/hicolor/*/apps/%{name}-icon.png
 
 %changelog
+* Tue Feb 12 2019 Jeremy Newton <alexjnewt AT hotmail DOT com> - 1.9.94-18.20181218.git7ce3857
+- Update to git version, old upstream is dead
+
 * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.94-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index 17485c0..3ea5732 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-677003f52ef86ca6feba46a102514a81  pcsxr-87788.zip
+SHA512 (pcsxr-7ce3857.tar.gz) = 9ed1a381495b8938c957ab27cc0e56beef0d634d1d268a93f471820fecee349ed0cf6c8ad0db45671e9b9dbdcfebeb72a02a5e3e3e6fd7fd20d9ab797f3c9e3d