diff --git a/Makefile b/Makefile
index 3e21ef43b..6484dbbc9 100644
--- a/Makefile
+++ b/Makefile
@@ -113,7 +113,7 @@ version-update: release-update
 		./makeapi --validate; \
 	fi
 
-server:
+server: version-update
 	python setup.py build
 
 server-install: server
diff --git a/freeipa.spec.in b/freeipa.spec.in
index cc674e1ad..c49ca2b56 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -218,12 +218,12 @@ cd install; ../autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localst
 %endif
 
 %if ! %{ONLY_CLIENT}
-make IPA_VERSION_IS_GIT_SNAPSHOT=no %{?_smp_mflags} version-update all
+make IPA_VERSION_IS_GIT_SNAPSHOT=no %{?_smp_mflags} all
 cd selinux
 # This isn't multi-process make capable yet
 make all
 %else
-make IPA_VERSION_IS_GIT_SNAPSHOT=no %{?_smp_mflags} version-update client
+make IPA_VERSION_IS_GIT_SNAPSHOT=no %{?_smp_mflags} client
 %endif
 
 %install