diff --git a/doc/conf.py b/doc/conf.py
index ec429c9..5b20c01 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -74,7 +74,10 @@ author = 'Invisible Things Lab'
 # The short X.Y version.
 version = open('../version').read().strip()
 # The full version, including alpha/beta/rc tags.
-release = subprocess.check_output(['git', 'describe', '--long', '--dirty']).strip().decode()
+try:
+    release = subprocess.check_output(['git', 'describe', '--long', '--dirty']).strip().decode()
+except:
+    release = "1"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/rpm_spec/qubes-core-admin-client.spec b/rpm_spec/qubes-core-admin-client.spec.in
similarity index 95%
rename from rpm_spec/qubes-core-admin-client.spec
rename to rpm_spec/qubes-core-admin-client.spec.in
index e2dfc25..b555d02 100644
--- a/rpm_spec/qubes-core-admin-client.spec
+++ b/rpm_spec/qubes-core-admin-client.spec.in
@@ -1,5 +1,5 @@
 Name:		qubes-core-admin-client
-Version:    %(cat version)
+Version:    @VERSION@
 Release:	0.1%{?dist}
 Summary:	Qubes OS admin client tools
 
@@ -23,10 +23,7 @@ BuildRequires:	python3-dbus
 Requires:   python3-qubesadmin
 %endif
 BuildArch:  noarch
-
-%if 0%{?qubes_builder}
-%define _builddir %(pwd)
-%endif
+Source0: %{name}-%{version}.tar.gz
 
 %description
 This package include managemt tools, like qvm-*.
@@ -65,14 +62,13 @@ Python3 module qubesadmin.
 %endif
 
 %prep
-%if !0%{?qubes_builder}
 %setup -q
-%endif
 
 
 %build
 make -C doc PYTHON=%{__python3} SPHINXBUILD=sphinx-build-%{python3_version} man
 
+
 %install
 rm -rf build
 %make_install PYTHON=%{__python2}
@@ -107,4 +103,4 @@ make -C doc DESTDIR=$RPM_BUILD_ROOT \
 
 
 %changelog
-
+@CHANGELOG@