diff --git a/_service b/_service
index 70f60b4..a207f23 100644
--- a/_service
+++ b/_service
@@ -1,3 +1,13 @@
 <services>
-  <service name="tar_scm"><param name="include">CMakeLists.txt</param><param name="url">https://code.google.com/p/lugaru/</param><param name="scm">hg</param><param name="include">cmake/*</param><param name="versionformat">1.0.rev{rev}</param><param name="include">COPYING.txt</param><param name="include">Source/*</param></service>
-<service name="recompress"><param name="file">*.tar</param><param name="compression">bz2</param></service><service name="set_version"/></services>
\ No newline at end of file
+  <service name="tar_scm">
+    <param name="scm">git</param>
+    <param name="url">https://gitlab.com/osslugaru/lugaru.git</param>
+    <param name="revision">refs/tags/1.1</param>
+    <param name="versionformat">@PARENT_TAG@</param>
+  </service>
+  <service name="recompress">
+    <param name="file">*.tar</param>
+    <param name="compression">xz</param>
+  </service>
+  <service name="set_version"/>
+</services>
diff --git a/_service:recompress:tar_scm:lugaru-1.0.rev506.tar.bz2 b/_service:recompress:tar_scm:lugaru-1.0.rev506.tar.bz2
deleted file mode 100644
index 794ac4f..0000000
--- a/_service:recompress:tar_scm:lugaru-1.0.rev506.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:723f241e7c4dab310eea3edabad06672d0644b643438aaf69d31247521401d09
-size 461244
diff --git a/_service:recompress:tar_scm:lugaru-1.1.tar.xz b/_service:recompress:tar_scm:lugaru-1.1.tar.xz
new file mode 100644
index 0000000..65a332a
--- /dev/null
+++ b/_service:recompress:tar_scm:lugaru-1.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9a6568c78f90f1af6cadcb3de2c5378996709842aae9e74e3d6beb1c29efa14a
+size 34386828
diff --git a/_service:set_version:lugaru.spec b/_service:set_version:lugaru.spec
index 088e75e..d7df9d3 100644
--- a/_service:set_version:lugaru.spec
+++ b/_service:set_version:lugaru.spec
@@ -1,7 +1,8 @@
 #
 # spec file for package lugaru
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 Neal Gompa <ngompa13@gmail.com>.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,38 +18,42 @@
 
 
 Name:           lugaru
-Summary:        Kung-Fu Rabbit Adventure Video Game
-License:        GPL-2.0
-Group:          Amusements/Games/Action/Other
-%define main_version 1.0
-Version:        1.0.rev506
+Version:        1.1
 Release:        0
-Url:            http://code.google.com/p/lugaru/
-# revision 275
-Source:         %{name}-%{version}.tar.bz2
-Source1:        %{name}.desktop
-# PATCH-FIX-UPSTREAM lugaru-1.0.rev225-cmake-fix.patch adam@mizerski.pl -- Fix detecting GLU
-Patch0:         lugaru-1.0.rev225-cmake-fix.patch
-# PATCH-FIX-OPENSUSE lugaru-1.0-dont-install-data.patch adam@mizerski.pl -- Don't try to install Data, since it's in lugaru-1.0-data package
-Patch1:         lugaru-1.0-dont-install-data.patch
-# PATCH-FIX-UPSTREAM lugaru-1.0.rev506-no-return.patch kkirill@opensuse.org -- Add missing return statement
-Patch2:         lugaru-1.0.rev506-no-return.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  Mesa-devel
+Summary:        Third person ninja rabbit fighting game
+License:        GPL-2.0+
+Group:          Amusements/Games/Action/Other
+Url:            https://osslugaru.gitlab.io/
+Source:         %{name}-%{version}.tar.xz
+# PATCH-FIX-OPENSUSE lugaru-1.1-do-not-install-documentation.patch ngompa13@gmail.com -- Don't try to install docs, as we're doing it ourselves
+Patch0:         lugaru-1.1-do-not-install-documentation.patch
 BuildRequires:  cmake
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
-BuildRequires:  libSDL-devel
+# Icon is installed into hicolor-icon-theme path
+BuildRequires:  hicolor-icon-theme
 BuildRequires:  libjpeg-devel
-BuildRequires:  libogg-devel
-BuildRequires:  libpng-devel
-BuildRequires:  libvorbis-devel
-BuildRequires:  openal-soft-devel
+BuildRequires:  pkgconfig
 BuildRequires:  update-desktop-files
 BuildRequires:  xorg-x11-devel
-BuildRequires:  zlib-devel
-Provides:       %{name} = %{main_version}
-Requires:       %{name}-data = %{main_version}
+BuildRequires:  pkgconfig(glu)
+BuildRequires:  pkgconfig(libpng)
+BuildRequires:  pkgconfig(ogg)
+BuildRequires:  pkgconfig(openal)
+BuildRequires:  pkgconfig(sdl2)
+BuildRequires:  pkgconfig(vorbis)
+BuildRequires:  pkgconfig(vorbisfile)
+BuildRequires:  pkgconfig(zlib)
+Requires:       hicolor-icon-theme
+# Require Lugaru game content
+Requires:       %{name}-data = %{version}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+
+%if 0%{?suse_version}
+# Ensure cache is updated
+Requires(post): hicolor-icon-theme
+Requires(postun): hicolor-icon-theme
+%endif
 
 %description
 Lugaru (pronounced Loo-GAH-roo) is the predecessor to Overgrowth (http://www.wolfire.com/overgrowth).
@@ -58,43 +63,60 @@ those responsible for slaughtering his village, he uncovers a far-reaching consp
 corrupt leaders of the rabbit republic and the starving wolves from a nearby den. Turner takes it
 upon himself to fight against their plot and save his fellow rabbits from slavery.
 
+%package data
+Summary:        Arch-independent data files for the Lugaru game
+Group:          Amusements/Games/Action/Other
+%if 0%{?suse_version} && 0%{?suse_version} <= 1310
+License:        CC-BY-SA-3.0+
+%else
+License:        CC-BY-SA-3.0 and CC-BY-SA-4.0
+%endif
+Requires:       %{name} = %{version}
+BuildArch:      noarch
+
+%description data
+This package contains arch-independent data files for the game Lugaru.
+
 %prep
 %setup -q
-%patch0
-%patch1
-%patch2
+%patch0 -p1
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS"
-export CXXFLAGS="$RPM_OPT_FLAGS"
-cmake -DLUGARU_INSTALL_PREFIX=%{_libdir}/%{name} -G "Unix Makefiles"
-%__make VERBOSE=1 %{?_smp_mflags}
+# Ensure that it looks in the right place for the game data
+%cmake -DSYSTEM_INSTALL=ON \
+       -DCMAKE_INSTALL_DATADIR=%{_datadir}/%{name}
+
+make VERBOSE=1 %{?_smp_mflags}
 
 %install
-%makeinstall
-mkdir -p %{buildroot}%{_datadir}/%{name}-data
-%__ln_s %{_datadir}/%{name}-data %{buildroot}%{_libdir}/%{name}/Data
-%__install -D -d %{buildroot}%{_bindir}
-%__cat >%{buildroot}%{_bindir}/%{name} <<EOF
-#!/bin/bash
-cd %{_libdir}/%{name}/
-./%{name}
-EOF
-%__chmod +x %{buildroot}%{_bindir}/%{name}
-%__install -D -m 644 Source/win-res/Lugaru.png %{buildroot}%{_datadir}/pixmaps/%{name}.png
-%__install -D -m 644 %{SOURCE1} %{buildroot}%{_datadir}/applications/%{name}.desktop
+%make_install -C build
+
+%fdupes %{buildroot}%{_datadir}
+
 %if 0%{?suse_version}
 %suse_update_desktop_file %{name}
+
+%post
+%icon_theme_cache_post
+
+%postun
+%icon_theme_cache_postun
 %endif
 
 %files
 %defattr(-,root,root)
-%doc COPYING.txt
+%doc COPYING.txt AUTHORS RELEASE-NOTES.md Docs/*
 %{_bindir}/%{name}
-%dir %{_libdir}/%{name}
-%{_libdir}/%{name}/*
-%dir %{_datadir}/%{name}-data
+%dir %{_datadir}/appdata
+%{_datadir}/appdata/%{name}.appdata.xml
 %{_datadir}/applications/%{name}.desktop
-%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
+%{_mandir}/man6/%{name}.6*
+
+%files data
+%defattr(-,root,root)
+%doc CONTENT-LICENSE.txt
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/*
 
 %changelog
diff --git a/lugaru-1.0-dont-install-data.patch b/lugaru-1.0-dont-install-data.patch
deleted file mode 100644
index 4af2584..0000000
--- a/lugaru-1.0-dont-install-data.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: CMakeLists.txt
-===================================================================
---- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -550,10 +550,6 @@ else(WIN32)
- 	endif(APPLE AND LUGARU_HAS_INTERNAL_SDL)
- endif(WIN32)
- 
--if(NOT APPLE)
--install(DIRECTORY ${CMAKE_SOURCE_DIR}/Data DESTINATION ${CMAKE_INSTALL_PREFIX})
--endif(NOT APPLE)
--
- if(APPLE)
- install(DIRECTORY ${CMAKE_SOURCE_DIR}/Data DESTINATION ${APPS_ROOT})
- endif(APPLE)
diff --git a/lugaru-1.0.rev225-cmake-fix.patch b/lugaru-1.0.rev225-cmake-fix.patch
deleted file mode 100644
index 00b1f33..0000000
--- a/lugaru-1.0.rev225-cmake-fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: CMakeLists.txt
-===================================================================
---- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -415,9 +415,11 @@ if (NOT ZLIB_FOUND)
- endif (NOT ZLIB_FOUND)
- 
- option (LUGARU_FORCE_INTERNAL_GLU "Force internal libGLU, even if there's a system version" False)
--if (LUGARU_FORCE_INTERNAL_GLU)
--	set(OPENGL_GLU_FOUND False)
--endif (LUGARU_FORCE_INTERNAL_GLU)
-+if (NOT LUGARU_FORCE_INTERNAL_GLU)
-+    find_package(GLU)
-+else(NOT LUGARU_FORCE_INTERNAL_GLU)
-+    set(OPENGL_GLU_FOUND False)
-+endif (NOT LUGARU_FORCE_INTERNAL_GLU)
- 
- if (NOT OPENGL_GLU_FOUND)
-     message(STATUS "Using internal copy of libGLU")
diff --git a/lugaru-1.0.rev506-no-return.patch b/lugaru-1.0.rev506-no-return.patch
deleted file mode 100644
index be0a277..0000000
--- a/lugaru-1.0.rev506-no-return.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: Source/Game.cpp
-===================================================================
---- Source/Game.cpp.orig
-+++ Source/Game.cpp
-@@ -328,6 +328,7 @@ int Game::thread(void *data) {
-     if(pt) {
-         (pt->game->*(pt->method))();
-     }
-+    return 0;
- }
- 
- void Game::DrawGL() {
diff --git a/lugaru-1.1-do-not-install-documentation.patch b/lugaru-1.1-do-not-install-documentation.patch
new file mode 100644
index 0000000..f30ce5f
--- /dev/null
+++ b/lugaru-1.1-do-not-install-documentation.patch
@@ -0,0 +1,21 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5869354..5e4f99a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -291,16 +291,3 @@ if(APPLE)
+     install(FILES ${CMAKE_SOURCE_DIR}/Dist/OSX/Lugaru.icns DESTINATION ${LUGARU_RESDIR})
+     install(FILES ${CMAKE_SOURCE_DIR}/Dist/OSX/Info.plist DESTINATION ${LUGARU_APP_ROOT}/Contents)
+ endif(APPLE)
+-
+-# Documentation
+-
+-install(FILES ${CMAKE_SOURCE_DIR}/AUTHORS
+-              ${CMAKE_SOURCE_DIR}/CONTENT-LICENSE.txt
+-              ${CMAKE_SOURCE_DIR}/COPYING.txt
+-              ${CMAKE_SOURCE_DIR}/README.md
+-              ${CMAKE_SOURCE_DIR}/RELEASE-NOTES.md
+-              ${CMAKE_SOURCE_DIR}/Docs/DEVTOOLS.txt
+-              ${CMAKE_SOURCE_DIR}/Docs/README.Empire.txt
+-              ${CMAKE_SOURCE_DIR}/Docs/README.SevenTasks.txt
+-              ${CMAKE_SOURCE_DIR}/Docs/README.Temple.txt
+-        DESTINATION ${LUGARU_DOCDIR})
diff --git a/lugaru.changes b/lugaru.changes
index 1e74fef..f898c2e 100644
--- a/lugaru.changes
+++ b/lugaru.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Fri Dec 16 22:48:19 UTC 2016 - ngompa13@gmail.com
+
+- Apply corrections to the spec based on spec-cleaner run 
+
+-------------------------------------------------------------------
+Thu Dec 15 13:17:34 UTC 2016 - ngompa13@gmail.com
+
+- Merge lugaru-data into lugaru spec as subpackage
+
+-------------------------------------------------------------------
+Thu Dec 15 11:06:02 UTC 2016 - ngompa13@gmail.com
+
+- update to official 1.1 release
+- update source service to pull from official git repository
+- dropped all old patches
+- added lugaru-1.1-do-not-install-documentation.patch
+
 -------------------------------------------------------------------
 Sat Jul 14 07:51:14 UTC 2012 - kkirill@opensuse.org
 
diff --git a/lugaru.desktop b/lugaru.desktop
deleted file mode 100644
index 22743d1..0000000
--- a/lugaru.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=Lugaru
-GenericName=Third-Person Action Game
-GenericName[ru]=Драки от 3-его лица 
-Comment=Kung-Fu Rabbit 3D Action Game
-Comment[ru]=3-х мерная аркадная игра про кунг-фу кролика
-Icon=lugaru
-Exec=lugaru
-Categories=Game;ActionGame;
diff --git a/lugaru.spec b/lugaru.spec
index 7e42931..d7df9d3 100644
--- a/lugaru.spec
+++ b/lugaru.spec
@@ -1,7 +1,8 @@
 #
 # spec file for package lugaru
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 Neal Gompa <ngompa13@gmail.com>.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,38 +18,42 @@
 
 
 Name:           lugaru
-Summary:        Kung-Fu Rabbit Adventure Video Game
-License:        GPL-2.0
-Group:          Amusements/Games/Action/Other
-%define main_version 1.0
-Version:        1.0
+Version:        1.1
 Release:        0
-Url:            http://code.google.com/p/lugaru/
-# revision 275
-Source:         %{name}-%{version}.tar.bz2
-Source1:        %{name}.desktop
-# PATCH-FIX-UPSTREAM lugaru-1.0.rev225-cmake-fix.patch adam@mizerski.pl -- Fix detecting GLU
-Patch0:         lugaru-1.0.rev225-cmake-fix.patch
-# PATCH-FIX-OPENSUSE lugaru-1.0-dont-install-data.patch adam@mizerski.pl -- Don't try to install Data, since it's in lugaru-1.0-data package
-Patch1:         lugaru-1.0-dont-install-data.patch
-# PATCH-FIX-UPSTREAM lugaru-1.0.rev506-no-return.patch kkirill@opensuse.org -- Add missing return statement
-Patch2:         lugaru-1.0.rev506-no-return.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  Mesa-devel
+Summary:        Third person ninja rabbit fighting game
+License:        GPL-2.0+
+Group:          Amusements/Games/Action/Other
+Url:            https://osslugaru.gitlab.io/
+Source:         %{name}-%{version}.tar.xz
+# PATCH-FIX-OPENSUSE lugaru-1.1-do-not-install-documentation.patch ngompa13@gmail.com -- Don't try to install docs, as we're doing it ourselves
+Patch0:         lugaru-1.1-do-not-install-documentation.patch
 BuildRequires:  cmake
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
-BuildRequires:  libSDL-devel
+# Icon is installed into hicolor-icon-theme path
+BuildRequires:  hicolor-icon-theme
 BuildRequires:  libjpeg-devel
-BuildRequires:  libogg-devel
-BuildRequires:  libpng-devel
-BuildRequires:  libvorbis-devel
-BuildRequires:  openal-soft-devel
+BuildRequires:  pkgconfig
 BuildRequires:  update-desktop-files
 BuildRequires:  xorg-x11-devel
-BuildRequires:  zlib-devel
-Provides:       %{name} = %{main_version}
-Requires:       %{name}-data = %{main_version}
+BuildRequires:  pkgconfig(glu)
+BuildRequires:  pkgconfig(libpng)
+BuildRequires:  pkgconfig(ogg)
+BuildRequires:  pkgconfig(openal)
+BuildRequires:  pkgconfig(sdl2)
+BuildRequires:  pkgconfig(vorbis)
+BuildRequires:  pkgconfig(vorbisfile)
+BuildRequires:  pkgconfig(zlib)
+Requires:       hicolor-icon-theme
+# Require Lugaru game content
+Requires:       %{name}-data = %{version}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+
+%if 0%{?suse_version}
+# Ensure cache is updated
+Requires(post): hicolor-icon-theme
+Requires(postun): hicolor-icon-theme
+%endif
 
 %description
 Lugaru (pronounced Loo-GAH-roo) is the predecessor to Overgrowth (http://www.wolfire.com/overgrowth).
@@ -58,43 +63,60 @@ those responsible for slaughtering his village, he uncovers a far-reaching consp
 corrupt leaders of the rabbit republic and the starving wolves from a nearby den. Turner takes it
 upon himself to fight against their plot and save his fellow rabbits from slavery.
 
+%package data
+Summary:        Arch-independent data files for the Lugaru game
+Group:          Amusements/Games/Action/Other
+%if 0%{?suse_version} && 0%{?suse_version} <= 1310
+License:        CC-BY-SA-3.0+
+%else
+License:        CC-BY-SA-3.0 and CC-BY-SA-4.0
+%endif
+Requires:       %{name} = %{version}
+BuildArch:      noarch
+
+%description data
+This package contains arch-independent data files for the game Lugaru.
+
 %prep
 %setup -q
-%patch0
-%patch1
-%patch2
+%patch0 -p1
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS"
-export CXXFLAGS="$RPM_OPT_FLAGS"
-cmake -DLUGARU_INSTALL_PREFIX=%{_libdir}/%{name} -G "Unix Makefiles"
-%__make VERBOSE=1 %{?_smp_mflags}
+# Ensure that it looks in the right place for the game data
+%cmake -DSYSTEM_INSTALL=ON \
+       -DCMAKE_INSTALL_DATADIR=%{_datadir}/%{name}
+
+make VERBOSE=1 %{?_smp_mflags}
 
 %install
-%makeinstall
-mkdir -p %{buildroot}%{_datadir}/%{name}-data
-%__ln_s %{_datadir}/%{name}-data %{buildroot}%{_libdir}/%{name}/Data
-%__install -D -d %{buildroot}%{_bindir}
-%__cat >%{buildroot}%{_bindir}/%{name} <<EOF
-#!/bin/bash
-cd %{_libdir}/%{name}/
-./%{name}
-EOF
-%__chmod +x %{buildroot}%{_bindir}/%{name}
-%__install -D -m 644 Source/win-res/Lugaru.png %{buildroot}%{_datadir}/pixmaps/%{name}.png
-%__install -D -m 644 %{SOURCE1} %{buildroot}%{_datadir}/applications/%{name}.desktop
+%make_install -C build
+
+%fdupes %{buildroot}%{_datadir}
+
 %if 0%{?suse_version}
 %suse_update_desktop_file %{name}
+
+%post
+%icon_theme_cache_post
+
+%postun
+%icon_theme_cache_postun
 %endif
 
 %files
 %defattr(-,root,root)
-%doc COPYING.txt
+%doc COPYING.txt AUTHORS RELEASE-NOTES.md Docs/*
 %{_bindir}/%{name}
-%dir %{_libdir}/%{name}
-%{_libdir}/%{name}/*
-%dir %{_datadir}/%{name}-data
+%dir %{_datadir}/appdata
+%{_datadir}/appdata/%{name}.appdata.xml
 %{_datadir}/applications/%{name}.desktop
-%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
+%{_mandir}/man6/%{name}.6*
+
+%files data
+%defattr(-,root,root)
+%doc CONTENT-LICENSE.txt
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/*
 
 %changelog