diff --git a/ChangeLog b/ChangeLog
index d17cf3e90a..e352549ead 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-12  Thomas Schwinge  <thomas@codesourcery.com>
+
+	* sysdeps/unix/Makefile ($(objpfx)stub-syscalls.c): Fix case for
+	non-default versions.
+
 2012-06-11  Roland McGrath  <roland@hack.frob.com>
 
 	[BZ #14218]
diff --git a/sysdeps/unix/Makefile b/sysdeps/unix/Makefile
index c8ef96d50e..9e95b567c8 100644
--- a/sysdeps/unix/Makefile
+++ b/sysdeps/unix/Makefile
@@ -51,9 +51,9 @@ $(objpfx)stub-syscalls.c: $(common-objpfx)sysd-syscalls \
 		 echo "strong_alias (_no_syscall, $${call}_$${ver})"; \
 		 echo "default_symbol_version \
 		         ($${call}_$${ver}, $$call, $$ver);" ;; \
-	   *@@*) ver=$${call##*@}; call=$${call%%*@}; \
-		 echo "strong_alias (_no_syscall, $${call}_$${ver})"; \
-		 echo "symbol_version ($${call}_$${ver}, $$call, $$ver);" ;; \
+	   *@*) ver=$${call##*@}; call=$${call%%*@}; \
+		echo "strong_alias (_no_syscall, $${call}_$${ver})"; \
+		echo "symbol_version ($${call}_$${ver}, $$call, $$ver);" ;; \
 	   *) echo "weak_alias (_no_syscall, $$call)"; \
 	      echo "stub_warning ($$call)"; \
 	      echo "weak_alias (_no_syscall, __GI_$$call)" ;; \