diff --git a/.abf.yml b/.abf.yml
index cbf5e98..7edefa0 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,3 @@
 sources:
-  fheroes2-src-r3277.tar.bz2: e744d471597170b50b8105ee5292bec05c7475cf
+  fheroes2-0.8.4.tar.gz: 035af02439f0521016aae07b13b19a833574d9ab
+  fheroes2.png: 29369e838940593d9fe23321903f40d58f4f1d6c
diff --git a/fheroes2.png b/fheroes2.png
deleted file mode 100644
index 0b90b73..0000000
Binary files a/fheroes2.png and /dev/null differ
diff --git a/fheroes2.spec b/fheroes2.spec
index bf5a03b..98dab6f 100644
--- a/fheroes2.spec
+++ b/fheroes2.spec
@@ -1,24 +1,22 @@
-%define rev r3277
-
 Summary:	Free implementation of Heroes of the Might and Magic II engine
 Name:		fheroes2
-Version:	20150413
-Release:	3
+Version:	0.8.4
+Release:	1
 License:	GPLv2+
 Group:		Games/Strategy
-Url:		http://sourceforge.net/projects/fheroes2/
-Source0:	%{name}-src-%{rev}.tar.bz2
+Url:		https://github.com/inhub
+Source0:	https://github.com/ihhub/fheroes2/archive/%{version}/%{name}-%{version}.tar.gz
 Source2:	fheroes2.sh
 Source3:	fheroes2.png
 Source4:	fheroes2.desktop
 Source5:	fheroes2.cfg
 BuildRequires:	pkgconfig(freetype2)
 BuildRequires:	pkgconfig(libpng)
-BuildRequires:	pkgconfig(sdl)
-BuildRequires:	pkgconfig(SDL_image)
-BuildRequires:	pkgconfig(SDL_mixer)
-BuildRequires:	pkgconfig(SDL_net)
-BuildRequires:	pkgconfig(SDL_ttf)
+BuildRequires:	pkgconfig(sdl2)
+BuildRequires:	pkgconfig(SDL2_image)
+BuildRequires:	pkgconfig(SDL2_mixer)
+BuildRequires:	pkgconfig(SDL2_net)
+BuildRequires:	pkgconfig(SDL2_ttf)
 BuildRequires:	pkgconfig(zlib)
 
 %description
@@ -27,7 +25,7 @@ You need to copy files from data and maps directories from original game
 into your /usr/share/games/fheroes2/{maps,data} directories respectively.
 
 %files
-%doc AUTHORS changelog.txt COPYING LICENSE README
+%doc LICENSE
 %{_gamesbindir}/*
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/applications/%{name}.desktop
@@ -36,27 +34,27 @@ into your /usr/share/games/fheroes2/{maps,data} directories respectively.
 #----------------------------------------------------------------------------
 
 %prep
-%setup -qn %{name}-src-%{rev}/fheroes2
+%autosetup -p1
 
 %build
-cd src
-%setup_compile_flags
-%make \
+%set_build_flags
+%make_build \
 	WITH_AI=simple \
+	WITH_SDL2="ON" \
 	CONFIGURE_FHEROES2_DATA="%{_gamesdatadir}/%{name}/"
 
 %install
 # let's create directory structure...
-mkdir -p %{buildroot}%{_gamesbindir}
-mkdir -p %{buildroot}%{_datadir}/applications
-mkdir -p %{buildroot}%{_datadir}/pixmaps
-mkdir -p %{buildroot}%{_gamesdatadir}/%{name}/{data,maps}
+%__mkdir_p %{buildroot}%{_gamesbindir}
+%__mkdir_p %{buildroot}%{_datadir}/applications
+%__mkdir_p %{buildroot}%{_datadir}/pixmaps
+%__mkdir_p %{buildroot}%{_gamesdatadir}/%{name}/{data,maps}
 
 # and install what we need where we need it to be...
-install -pm755 src/dist/%{name} %{buildroot}%{_gamesbindir}/%{name}.bin
-install -pm755 %{SOURCE2} %{buildroot}%{_gamesbindir}/%{name}
-install -pm 644 %{name}.cfg %{buildroot}%{_gamesdatadir}/%{name}/
-install -pm 644 %{name}.key %{buildroot}%{_gamesdatadir}/%{name}/
-install -pm 644 %{SOURCE3} %{buildroot}%{_datadir}/pixmaps/%{name}.png
-install -pm 644 %{SOURCE4} %{buildroot}%{_datadir}/applications/%{name}.desktop
-install -pm 644 %{SOURCE5} %{buildroot}%{_gamesdatadir}/%{name}/
+%__install -pm755 %{name} %{buildroot}%{_gamesbindir}/%{name}.bin
+%__install -pm755 %{SOURCE2} %{buildroot}%{_gamesbindir}/%{name}
+#__install -pm 644 %{name}.cfg %{buildroot}%{_gamesdatadir}/%{name}/
+%__install -pm 644 %{name}.key %{buildroot}%{_gamesdatadir}/%{name}/
+%__install -pm 644 %{SOURCE3} %{buildroot}%{_datadir}/pixmaps/%{name}.png
+%__install -pm 644 %{SOURCE4} %{buildroot}%{_datadir}/applications/%{name}.desktop
+%__install -pm 644 %{SOURCE5} %{buildroot}%{_gamesdatadir}/%{name}/