diff --git a/autoyast2-3.1.91.tar.bz2 b/autoyast2-3.1.91.tar.bz2
deleted file mode 100644
index e14ed28..0000000
--- a/autoyast2-3.1.91.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:48b105a613fb46793653816bb85cd25cf5a838c51a1cfe8806b080416372c049
-size 646281
diff --git a/autoyast2-3.1.93.tar.bz2 b/autoyast2-3.1.93.tar.bz2
new file mode 100644
index 0000000..6929bab
--- /dev/null
+++ b/autoyast2-3.1.93.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0dc6e880a66fa5b48a14fdef40cffad4f7e1f55c92aadda25a5053693171d44a
+size 649368
diff --git a/autoyast2.changes b/autoyast2.changes
index 5842f73..84d989d 100644
--- a/autoyast2.changes
+++ b/autoyast2.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Mon Sep  7 22:32:50 UTC 2015 - igonzalezsosa@suse.com
+
+- Fix premature loading of AutoInstall which prevented running
+  configuration clients during 2nd stage (bsc#944770)
+- 3.1.93
+
+-------------------------------------------------------------------
+Tue Sep  1 15:25:44 UTC 2015 - igonzalezsosa@suse.com
+
+- Move users creation to the first stage, so it is not needed
+  to run the 2nd stage to have a minimal system.
+- Do no add AutoYaST packages if the second stage won't be
+  executed.
+- Fixes bnc#892091
+- 3.1.92
+
 -------------------------------------------------------------------
 Tue Aug 25 14:49:13 CEST 2015 - schubi@suse.de
 
diff --git a/autoyast2.spec b/autoyast2.spec
index 11febdf..4a7cfb7 100644
--- a/autoyast2.spec
+++ b/autoyast2.spec
@@ -17,7 +17,7 @@
 
 
 Name:           autoyast2
-Version:        3.1.91
+Version:        3.1.93
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -57,6 +57,7 @@ Requires:       yast2-schema
 Requires:       yast2-storage >= 3.1.59
 Requires:       yast2-transfer >= 2.21.0
 Requires:       yast2-xml
+Conflicts:      yast2-installation < 3.1.158
 
 Provides:       yast2-config-autoinst
 Provides:       yast2-module-autoinst
@@ -204,6 +205,8 @@ rmdir $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/autoyast2/html/autoyast
 %{yast_moduledir}/Kickstart.rb
 %dir %{yast_agentdir}
 %{yast_agentdir}/ag_ksimport
+%dir %{yast_libdir}/autoinstall
+%{yast_libdir}/autoinstall/*.rb
 
 # additional files
 
@@ -263,6 +266,7 @@ rmdir $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/autoyast2/html/autoyast
 %{yast_moduledir}/AutoinstDrive.rb
 %{yast_moduledir}/AutoinstPartPlan.rb
 %{yast_moduledir}/AutoinstPartition.rb
+%{yast_moduledir}/AutoinstFunctions.rb
 
 #clients
 %{yast_clientdir}/inst_autoinit.rb