diff --git a/CHANGES b/CHANGES
index 05cd935b713f5d25e1b958b6a7900af12f6dd5cf..535d56d07249a5c1ed1ab66348060696199dc79b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,10 @@
 
  Changes between 0.9.2b and 0.9.3
 
+  *) Add PEDANTIC compiler flag to allow compilation with gcc -pedantic,
+     without disallowing inline assembler and the like for non-pedantic builds.
+     [Ben Laurie]
+
   *) Support Borland C++ builder.
      [Janez Jere <jj@void.si>, modified by Ulf Möller]
 
diff --git a/Configure b/Configure
index b2860befdbeb98d920587262c76d64a9004df294..7636cb9960ea95ac956552658177f52318af13f0 100755
--- a/Configure
+++ b/Configure
@@ -93,7 +93,7 @@ my %table=(
 # Our development configs
 "purify",	"purify gcc:-g -DPURIFY -Wall:(unknown):-lsocket -lnsl::::",
 "debug",	"gcc:-DBN_DEBUG -DREF_CHECK -DCRYPTO_MDEBUG -ggdb -g2 -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror:(unknown):-lefence::::",
-"debug-ben",	"gcc:-DBN_DEBUG -DREF_CHECK -DCRYPTO_MDEBUG -O2 -pedantic -Wall -Wshadow -Werror -pipe:(unknown):::::",
+"debug-ben",	"gcc:-DBN_DEBUG -DREF_CHECK -DCRYPTO_MDEBUG -DPEDANTIC -O2 -pedantic -Wall -Wshadow -Werror -pipe:(unknown):::::",
 "debug-ben-debug",	"gcc:-DBN_DEBUG -DREF_CHECK -DCRYPTO_MDEBUG -g3 -O2 -pedantic -Wall -Wshadow -Werror -pipe:(unknown):::::",
 "debug-ben-strict",	"gcc:-DBN_DEBUG -DREF_CHECK -DCRYPTO_MDEBUG -DCONST_STRICT -O2 -Wall -Wshadow -Werror -Wpointer-arith -Wcast-qual -Wwrite-strings -pipe:(unknown):::::",
 "debug-rse","cc:-DTERMIOS -DL_ENDIAN -pipe -O -g -ggdb3 -Wall:(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm",
diff --git a/crypto/sha/sha_locl.h b/crypto/sha/sha_locl.h
index 32bbe30afd40f01b006945ed6905d015086c9d86..03215c29106426e38f0838f6114594d5582371e9 100644
--- a/crypto/sha/sha_locl.h
+++ b/crypto/sha/sha_locl.h
@@ -168,7 +168,7 @@
 #define ROTATE(a,n)     _lrotl(a,n)
 #elif defined(__GNUC__)
 /* some inline assembler templates by <appro@fy.chalmers.se> */
-#if defined(__i386)
+#if defined(__i386) && !defined(PEDANTIC)
 #define ROTATE(a,n)	({ register unsigned int ret;	\
 				asm ("roll %1,%0"	\
 				: "=r"(ret)		\