diff --git a/ChangeLog b/ChangeLog
index 71bd77e89..80c7cafa9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-12-18  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Use -Wl,--no-relax rather than -mno-relax for uniformity.
+
 2013-12-18  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* INSTALL: Update comment as to why sparc64 clang isn't usable.
diff --git a/conf/Makefile.common b/conf/Makefile.common
index de55c9ad4..015cd29ce 100644
--- a/conf/Makefile.common
+++ b/conf/Makefile.common
@@ -8,7 +8,7 @@ unexport LC_ALL
 # Platform specific options
 if COND_sparc64_ieee1275
   CFLAGS_PLATFORM += -mno-app-regs
-  LDFLAGS_PLATFORM = -Wl,-melf64_sparc -mno-relax
+  LDFLAGS_PLATFORM = -Wl,-melf64_sparc -Wl,--no-relax
 endif
 if COND_sparc64_emu
   CFLAGS_PLATFORM += -mno-app-regs