diff --git a/openssh-6.2p1-modpipe-cflags.patch b/openssh-6.2p1-modpipe-cflags.patch
new file mode 100644
index 0000000..abcf47a
--- /dev/null
+++ b/openssh-6.2p1-modpipe-cflags.patch
@@ -0,0 +1,12 @@
+diff -up openssh-6.2p1/Makefile.in.modpipe-pie openssh-6.2p1/Makefile.in
+--- openssh-6.2p1/Makefile.in.modpipe-pie	2013-04-04 14:44:26.293745777 +0200
++++ openssh-6.2p1/Makefile.in	2013-04-04 14:44:49.483647020 +0200
+@@ -418,7 +418,7 @@ uninstall:
+ 
+ regress/modpipe$(EXEEXT): $(srcdir)/regress/modpipe.c
+ 	[ -d `pwd`/regress ]  ||  mkdir -p `pwd`/regress; \
+-	$(CC) $(CPPFLAGS) -o $@ $? \
++	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $? \
+ 	$(LDFLAGS) -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
+ 
+ tests interop-tests:	$(TARGETS) regress/modpipe$(EXEEXT)
diff --git a/openssh.spec b/openssh.spec
index 924aabc..b5d077e 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -212,6 +212,10 @@ Patch903: openssh-6.1p1-required-authentications.patch
 # change default value of MaxStartups - CVE-2010-5107 - #908707
 Patch904: openssh-6.1p1-change-max-startups.patch
 
+# build regress/modpipe tests with $(CFLAGS), based on
+# http://lists.mindrot.org/pipermail/openssh-unix-dev/2013-March/031167.html
+Patch905: openssh-6.2p1-modpipe-cflags.patch
+
 #---
 #https://bugzilla.mindrot.org/show_bug.cgi?id=1604
 # sctp
@@ -458,6 +462,7 @@ popd
 # %patch902 -p1 -b .man-moduli
 # %patch903 -p1 -b .required-authentication
 # %patch904 -p1 -b .max-startups
+%patch905 -p1 -b .modpipe-cflags
 
 %if 0
 # Nothing here yet