diff --git a/gettext.spec b/gettext.spec
index 72ca6f8..8b7b2e8 100644
--- a/gettext.spec
+++ b/gettext.spec
@@ -1,12 +1,9 @@
 %bcond_with jar
 %bcond_with java
 
-%global tarversion 0.21
-%global archiveversion 0.21
-
 Summary: GNU libraries and utilities for producing multi-lingual messages
 Name: gettext
-Version: %{tarversion}
+Version: 0.21
 Release: 2%{?dist}
 # The following are licensed under LGPLv2+:
 # - libintl and its headers
@@ -175,7 +172,7 @@ think about.
 
 
 %prep
-%autosetup -n %{name}-%{tarversion} -S git
+%autosetup -S git
 
 # Defeat libtextstyle attempt to bundle libxml2.  The comments
 # indicate this is done because the libtextstyle authors do not want
@@ -337,8 +334,8 @@ make check LIBUNISTRING=-lunistring
 %{_datadir}/%{name}/ABOUT-NLS
 %{_datadir}/%{name}/po
 %{_datadir}/%{name}/styles
-%dir %{_datadir}/%{name}-%{tarversion}
-%{_datadir}/%{name}-%{tarversion}/its
+%dir %{_datadir}/%{name}-%{version}
+%{_datadir}/%{name}-%{version}/its
 
 %files common-devel
 %{_datadir}/%{name}/archive.*.tar.xz