diff --git a/sources b/sources
index 1a5efa1..2c5ae29 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-42677f3fadfd11191cda398f0f736132  uhd-3.4.3.tar.gz
-f9ba13a169d399bccd3143786657d42f  uhd-images_003.004.003-release.tar.gz
+65cf76fd363d576ceff9c1527ade297b  uhd-images_003.005.003-release.tar.gz
+99984db89c8fcf1db3aa1e5284fac1e7  uhd-release_003_005_003.tar.gz
diff --git a/uhd-3.4.2-no-neon.patch b/uhd-3.4.2-no-neon.patch
deleted file mode 100644
index 0bde709..0000000
--- a/uhd-3.4.2-no-neon.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -up uhd-3.4.2/host/lib/convert/CMakeLists.txt.orig uhd-3.4.2/host/lib/convert/CMakeLists.txt
---- uhd-3.4.2/host/lib/convert/CMakeLists.txt.orig	2012-05-23 00:16:15.000000000 +0200
-+++ uhd-3.4.2/host/lib/convert/CMakeLists.txt	2012-05-24 12:27:08.225172012 +0200
-@@ -93,15 +93,15 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
-     UNSET(CMAKE_REQUIRED_FLAGS)
- ENDIF(CMAKE_COMPILER_IS_GNUCXX)
- 
--IF(HAVE_ARM_NEON_H)
--    SET_SOURCE_FILES_PROPERTIES(
--        ${CMAKE_CURRENT_SOURCE_DIR}/convert_with_neon.cpp
--        PROPERTIES COMPILE_FLAGS "${NEON_FLAGS}"
--    )
--    LIBUHD_APPEND_SOURCES(
--        ${CMAKE_CURRENT_SOURCE_DIR}/convert_with_neon.cpp
--    )
--ENDIF()
-+#IF(HAVE_ARM_NEON_H)
-+#    SET_SOURCE_FILES_PROPERTIES(
-+#        ${CMAKE_CURRENT_SOURCE_DIR}/convert_with_neon.cpp
-+#        PROPERTIES COMPILE_FLAGS "${NEON_FLAGS}"
-+#    )
-+#    LIBUHD_APPEND_SOURCES(
-+#        ${CMAKE_CURRENT_SOURCE_DIR}/convert_with_neon.cpp
-+#    )
-+#ENDIF()
- 
- ########################################################################
- # Convert types generation
diff --git a/uhd-3.5.3-no-neon.patch b/uhd-3.5.3-no-neon.patch
new file mode 100644
index 0000000..7fa78fb
--- /dev/null
+++ b/uhd-3.5.3-no-neon.patch
@@ -0,0 +1,29 @@
+diff --git a/host/lib/convert/CMakeLists.txt b/host/lib/convert/CMakeLists.txt
+index 0d9d098..d50b5a1 100644
+--- a/host/lib/convert/CMakeLists.txt
++++ b/host/lib/convert/CMakeLists.txt
+@@ -97,15 +97,15 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
+     UNSET(CMAKE_REQUIRED_FLAGS)
+ ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+ 
+-IF(HAVE_ARM_NEON_H)
+-    SET_SOURCE_FILES_PROPERTIES(
+-        ${CMAKE_CURRENT_SOURCE_DIR}/convert_with_neon.cpp
+-        PROPERTIES COMPILE_FLAGS "${NEON_FLAGS}"
+-    )
+-    LIBUHD_APPEND_SOURCES(
+-        ${CMAKE_CURRENT_SOURCE_DIR}/convert_with_neon.cpp
+-    )
+-ENDIF()
++#IF(HAVE_ARM_NEON_H)
++#    SET_SOURCE_FILES_PROPERTIES(
++#        ${CMAKE_CURRENT_SOURCE_DIR}/convert_with_neon.cpp
++#        PROPERTIES COMPILE_FLAGS "${NEON_FLAGS}"
++#    )
++#    LIBUHD_APPEND_SOURCES(
++#        ${CMAKE_CURRENT_SOURCE_DIR}/convert_with_neon.cpp
++#    )
++#ENDIF()
+ 
+ ########################################################################
+ # Convert types generation
diff --git a/uhd.spec b/uhd.spec
index 4ad11f0..33ea541 100644
--- a/uhd.spec
+++ b/uhd.spec
@@ -4,24 +4,16 @@
 %bcond_without binary_firmware
 
 %global ver_major 3
-%global ver_minor 4
+%global ver_minor 5
 %global ver_patch 3
 
 %global ver %(printf "%03d.%03d.%03d" %{ver_major} %{ver_minor} %{ver_patch})
 %global ver_ %(printf "%03d_%03d_%03d" %{ver_major} %{ver_minor} %{ver_patch})
 
-# Pull from git
-%global git_tag release_%{ver_}
-
-# git clone git://code.ettus.com/ettus/uhd.git
-# cd uhd
-# git archive --format=tar --prefix=%%{name}-%%{version}/ %%{git_tag} | \
-# gzip > ../%%{name}-%%{version}.tar.gz
-
 Name:           uhd
 URL:            http://code.ettus.com/redmine/ettus/projects/uhd/wiki
 Version:        %{ver_major}.%{ver_minor}.%{ver_patch}
-Release:        3%{?dist}
+Release:        1%{?dist}
 License:        GPLv3+
 BuildRequires:  cmake
 BuildRequires:  boost-devel libusb1-devel python-cheetah
@@ -33,11 +25,11 @@ Requires(pre):  shadow-utils
 Requires:       tkinter
 Group:          Applications/Engineering
 Summary:        Universal Hardware Driver for Ettus Research products
-Source0:        %{name}-%{version}.tar.gz
+Source0:        http://github.com/EttusResearch/uhd/archive/release_%{ver_}.tar.gz#/uhd-release_%{ver_}.tar.gz
 Source1:        %{name}-limits.conf
 Source2:        http://files.ettus.com/binaries/uhd_stable/latest_release/uhd-images_%{ver}-release.tar.gz
 # ARM convert_test fix (rhbz#813393)
-Patch0:         uhd-3.4.2-no-neon.patch
+Patch0:         uhd-3.5.3-no-neon.patch
 # Fix firmware build with sdcc-3
 Patch1:         uhd-3.4.2-sdcc-3-fix.patch
 
@@ -47,7 +39,7 @@ The goal of the UHD is to provide a host driver and API for current and
 future Ettus Research products. It can be used standalone without GNU Radio.
 
 %prep
-%setup -q
+%setup -q -n uhd-release_%{ver_}
 %patch0 -p1 -b .no-neon
 %patch1 -p1 -b .sdcc-3-fix
 
@@ -107,6 +99,12 @@ install -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/security/limits.d/99-usr
 mkdir -p %{buildroot}%{_datadir}/uhd/images
 cp -r images/images/* %{buildroot}%{_datadir}/uhd/images
 
+# convert hardlinks to symlinks (to not package the file twice)
+pushd %{buildroot}%{_bindir}
+unlink ./usrp_n2xx_simple_net_burner
+ln -s ../..%{_libexecdir}/uhd/usrp_n2xx_simple_net_burner
+popd
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -146,6 +144,7 @@ getent group usrp >/dev/null || groupadd -r usrp >/dev/null
 %config(noreplace) %{_sysconfdir}/security/limits.d/*.conf
 %{_libdir}/lib*.so.*
 %{_libexecdir}/uhd
+%{_mandir}/man1/*.1*
 
 %files firmware
 %dir %{_datadir}/uhd/images
@@ -160,6 +159,10 @@ getent group usrp >/dev/null || groupadd -r usrp >/dev/null
 %doc %{_docdir}/%{name}/*
 
 %changelog
+* Wed Jun 05 2013 Jaroslav Škarvada <jskarvad@redhat.com> - 3.5.3-1
+- New version
+- Defuzzified no-neon patch
+
 * Sun Feb 10 2013 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 3.4.3-3
 - Rebuild for Boost-1.53.0