diff --git a/yast2-users-3.1.39.tar.bz2 b/yast2-users-3.1.39.tar.bz2
deleted file mode 100644
index b0dd5a9..0000000
--- a/yast2-users-3.1.39.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6e5cb8365735352e97ddd20354e5d6ba49fc592003f6a77c8beac44887f6b27c
-size 267358
diff --git a/yast2-users-3.1.40.tar.bz2 b/yast2-users-3.1.40.tar.bz2
new file mode 100644
index 0000000..d402aad
--- /dev/null
+++ b/yast2-users-3.1.40.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8342ed9a55bf7b4304ae5bcbfee2216e8ace4824c21ff5d2b044d724ed003e18
+size 267723
diff --git a/yast2-users.changes b/yast2-users.changes
index 7e16382..ab6ebf4 100644
--- a/yast2-users.changes
+++ b/yast2-users.changes
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Tue Sep  1 15:29:38 UTC 2015 - igonzalezsosa@suse.com
+
+- Move users creation to first stage during autoinstallation,
+  so it is not needed to run the 2nd stage to have a minimal system
+  (bnc#892091)
+- 3.1.40
+-------------------------------------------------------------------
 Thu Jul  2 20:49:05 UTC 2015 - igonzalezsosa@suse.com
 
 - Allow editing password-less users (bsc#928607)
diff --git a/yast2-users.spec b/yast2-users.spec
index 4fe681f..e8aa986 100644
--- a/yast2-users.spec
+++ b/yast2-users.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-users
-Version:        3.1.39
+Version:        3.1.40
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -57,6 +57,7 @@ Provides:       y2t_users
 Provides:       yast2-config-users
 Provides:       yast2-trans-inst-user
 Provides:       yast2-trans-users
+Conflicts:      autoyast2 < 3.1.92
 
 # y2usernote, y2useritem
 Requires:       yast2-perl-bindings >= 2.18.0