diff --git a/.gitignore b/.gitignore
index 39190c9..b47df34 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /libdnf-179c0a6.tar.gz
 /libdnf-8bd77f8.tar.gz
 /libdnf-f9b798c.tar.gz
+/libdnf-0.7.1.tar.gz
diff --git a/libdnf.spec b/libdnf.spec
index 18f2615..55b809c 100644
--- a/libdnf.spec
+++ b/libdnf.spec
@@ -1,6 +1,3 @@
-%global commit f9b798cadb6821f9cffd5c0331578b3f7c19d699
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-
 %global libsolv_version 0.6.21-1
 %global dnf_conflict 2.0.0-0.rc2.4
 
@@ -13,13 +10,23 @@
 %bcond_without python3
 %endif
 
+%if 0%{?rhel}
+%bcond_without rhsm
+%else
+%bcond_with rhsm
+%endif
+
+%global _cmake_opts \\\
+    -DENABLE_RHSM_SUPPORT=%{?with_rhsm:ON}%{!?with_rhsm:OFF} \\\
+    %{nil}
+
 Name:           libdnf
-Version:        0.7.0
-Release:        0.7git%{shortcommit}%{?dist}
+Version:        0.7.1
+Release:        1%{?dist}
 Summary:        Library providing simplified C and Python API to libsolv
 License:        LGPLv2+
 URL:            https://github.com/rpm-software-management/libdnf
-Source0:        %{url}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
+Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
 
 BuildRequires:  cmake
 BuildRequires:  gcc
@@ -33,6 +40,9 @@ BuildRequires:  pkgconfig(gio-unix-2.0) >= 2.44.0
 BuildRequires:  pkgconfig(gtk-doc)
 BuildRequires:  pkgconfig(gobject-introspection-1.0)
 BuildRequires:  rpm-devel >= 4.11.0
+%if %{with rhsm}
+BuildRequires:  pkgconfig(librhsm)
+%endif
 
 Requires:       libsolv%{?_isa} >= %{libsolv_version}
 
@@ -87,13 +97,13 @@ mkdir build-py3
 
 %build
 pushd build-py2
-  %cmake -DWITH_MAN=OFF ../ %{!?with_valgrind:-DDISABLE_VALGRIND=1}
+  %cmake -DWITH_MAN=OFF ../ %{!?with_valgrind:-DDISABLE_VALGRIND=1} %{_cmake_opts}
   %make_build
 popd
 
 %if %{with python3}
 pushd build-py3
-  %cmake -DPYTHON_DESIRED:str=3 -DWITH_GIR=0 -DWITH_MAN=0 -Dgtkdoc=0 ../ %{!?with_valgrind:-DDISABLE_VALGRIND=1}
+  %cmake -DPYTHON_DESIRED:str=3 -DWITH_GIR=0 -DWITH_MAN=0 -Dgtkdoc=0 ../ %{!?with_valgrind:-DDISABLE_VALGRIND=1} %{_cmake_opts}
   %make_build
 popd
 %endif
@@ -152,6 +162,9 @@ popd
 %endif
 
 %changelog
+* Fri Jan 06 2017 Igor Gnatenko <ignatenko@redhat.com> - 0.7.1-1
+- 0.7.1
+
 * Wed Dec 21 2016 Peter Robinson <pbrobinson@fedoraproject.org> 0.7.0-0.7gitf9b798c
 - Rebuild for Python 3.6
 
diff --git a/sources b/sources
index c217fb6..97cb270 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libdnf-f9b798c.tar.gz) = 99d23b239c93ed7377c2059a5ecd4ea1c4642fa2418346a48a14c9bdad000465c4ea873806765b008ea32acd21a47586e65ae882b40d71e39ab50e45d7d96744
+SHA512 (libdnf-0.7.1.tar.gz) = 4ca16bc589b06f9ddfe200a0c9755b823075d4faa967b24faad4ca0a29e16e479f1473765300b66b928f3f1688193bbefac3d9291d6faae6e3519a694d3a3b67