diff --git a/.gitignore b/.gitignore
index d938acb..de4e573 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /libxcrypt-4.0.0-20171109git15447aa.tar.gz
 /libxcrypt-4.0.0-20180120gitde99d27.tar.gz
 /libxcrypt-4.0.0-20180120git3436e7b.tar.gz
+/libxcrypt-4.0.0.tar.gz
diff --git a/libxcrypt.spec b/libxcrypt.spec
index ab7fe5e..07a1b1e 100644
--- a/libxcrypt.spec
+++ b/libxcrypt.spec
@@ -4,13 +4,6 @@
 %global sof 0
 %global sov %{soc}.%{sol}.%{sof}
 
-# For building snapshots.
-%global commit       3436e7b2b006b597fd97b581a6dfb7eba541cc9e
-%global commit_date  20180120
-%global short_commit %(c=%{commit}; echo ${c:0:7})
-%global gitrel       .%{commit_date}git%{short_commit}
-%global gitver       -%{commit_date}git%{short_commit}
-
 # Add generation of HMAC checksums of the final stripped
 # binaries.  %%define with lazy globbing is used here
 # intentionally, because using %%global does not work.
@@ -26,14 +19,14 @@
 
 Name:           libxcrypt
 Version:        4.0.0
-Release:        0.204%{?gitrel}%{?dist}
+Release:        1%{?dist}
 Summary:        Extended crypt library for DES, MD5, Blowfish and others
 
 # For explicit license breakdown, see the
 # LICENSING file in the source tarball.
 License:        LGPLv2+ and BSD and CDDL and Public Domain
 URL:            https://github.com/besser82/%{name}
-Source0:        %{url}/archive/%{commit}/%{name}-%{version}%{?gitver}.tar.gz
+Source0:        %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
 BuildRequires:  fipscheck
 BuildRequires:  libtool
@@ -189,6 +182,9 @@ is highly discouraged.
 
 
 %changelog
+* Sat Jan 27 2018 Björn Esser <besser82@fedoraproject.org> - 4.0.0-1
+- New upstream release
+
 * Mon Jan 22 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 4.0.0-0.204.20180120git3436e7b
 - Fix Obsoletes
 
diff --git a/sources b/sources
index 9f9422d..ec834bb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libxcrypt-4.0.0-20180120git3436e7b.tar.gz) = cfc6e48edecad7fc8de749ce96c560ef307ba9da4ca6dc1464bb8ea214c9b71202cfe0545125d10fdbaa232d9ce0b3c6f630d04260e8a2d315c0c33786495632
+SHA512 (libxcrypt-4.0.0.tar.gz) = e8e27e266917bc83c77238cf662749b8e6c4b1a367db4274517f48f27dffe42444e0cd91162868e6714ef8e47e02eecf4f2ae8a02eb60c5f172a7da9b7d4f46d