diff --git a/.gitignore b/.gitignore
index b44acf7..3ee5623 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /icons.tar.xz
 /stellarsolver-832bc60feb1fc8ffdf2780ccdd413c3baea648fb.tar.gz
+/stellarsolver-2.2.tar.gz
diff --git a/com.github.rlancaste.stellarsolver.desktop b/com.github.rlancaste.stellarsolver.desktop
deleted file mode 100644
index 1eae51e..0000000
--- a/com.github.rlancaste.stellarsolver.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Version=1.4
-Type=Application
-Name=StellarSolver
-Exec=StellarSolverTester
-Icon=StellarSolverIcon
-Categories=Science;Astronomy
diff --git a/sources b/sources
index 36ab559..183f1e1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (icons.tar.xz) = c9706169614239bea283ea8e1ebb6cd8f6ab737f7fe93cc9553a117f75adff5d06552432fbc2b8c957ca4df9837f996680cffeda2a4ec4e0753eb42ef13e9467
-SHA512 (stellarsolver-832bc60feb1fc8ffdf2780ccdd413c3baea648fb.tar.gz) = 2519b9f835dedc93f530f205845aadaa4d164b7566a6e74e3cf13aa550126831a91b9fe54091945357b1e8a049f5a2b59e92a77b19b09a3aa59124741ab95487
+SHA512 (stellarsolver-2.2.tar.gz) = 0b200437130ea8131ade9219e1055ea4265925168cbfb5a7bdcf3836e267a1b670df43f20d4657ef64dea2c1ef2314cfc0bcb8503eb4ead3f0cc3fae3267f7bc
diff --git a/stellarsolver.spec b/stellarsolver.spec
index 4cf84c1..7a55837 100644
--- a/stellarsolver.spec
+++ b/stellarsolver.spec
@@ -1,15 +1,10 @@
-%global forgeurl https://github.com/rlancaste/stellarsolver/
-%global commit 832bc60feb1fc8ffdf2780ccdd413c3baea648fb
-%global major_soversion 1
-%global minor_soversion 9
-
-%forgemeta
+%global major_soversion 2
+%global minor_soversion 2
 
 Name:           stellarsolver
-Version:        1.9
-Release:        4%{?dist}
+Version:        2.2
+Release:        1%{?dist}
 Summary:        The Cross Platform Sextractor and Internal Astrometric Solver
-
 License:        BSD and GPLv2+ and GPLv3+ and LGPLv2+ and LGPLv3+ and MIT
 # License breakdown
 #
@@ -25,11 +20,12 @@ License:        BSD and GPLv2+ and GPLv3+ and LGPLv2+ and LGPLv3+ and MIT
 #   stellarsolver/*.{cpp,h}
 #   stellarsolver/astrometry/include/astrometry/*qfits*.h
 #   stellarsolver/astrometry/qfits-an/*
-#   stellarsolver/astrometry/util/{bt.c,md5.c}
-#   tester/{dms,mainwindow,nan,stretch}.*
+#   stellarsolver/astrometry/util/md5.c
+#   tester/{mainwindow,nan}.*
+#   testerutils/{dms,stretch}.*
 #
 # LGPLv2+:
-#   tester/bayer.*
+#   testerutils/bayer.*
 #
 # LGPLv3+ and BSD and MIT:
 #   stellarsolver/sep/*
@@ -38,12 +34,8 @@ License:        BSD and GPLv2+ and GPLv3+ and LGPLv2+ and LGPLv3+ and MIT
 # MIT:
 #   stellarsolver/astrometry/blind/windirent.h
 #   
-URL:            %{forgeurl}
-Source0:        %{forgesource}
-# Upstream doesn't provide desktop file and icons
-# These will be proposed for inclusion to upstream
-Source1:        icons.tar.xz
-Source2:        com.github.rlancaste.stellarsolver.desktop
+URL:            https://github.com/rlancaste/%{name}/
+Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
 
 
 # Buildtime tools
@@ -99,9 +91,10 @@ developing applications that use %{name}.
 
 %install
 %cmake_install
-# Fedora provided desktop files and icons
-desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE2}
-tar -xJvf %{SOURCE1} -C %{buildroot}%{_datadir}
+
+
+%check
+desktop-file-validate %{buildroot}%{_datadir}/applications/com.github.rlancaste.%{name}.desktop
 
 
 %files
@@ -109,7 +102,7 @@ tar -xJvf %{SOURCE1} -C %{buildroot}%{_datadir}
 %doc README.md
 %{_bindir}/StellarSolverTester
 %{_datadir}/applications/com.github.rlancaste.stellarsolver.desktop
-%{_datadir}/icons/*/*/StellarSolverIcon.png
+%{_datadir}/icons/*/*/*/StellarSolverIcon.png
 
 %files libs
 %license LICENSE