diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index 985c2df72a5..92958ae55f1 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -366,13 +366,9 @@ SUBDIR+=	users
 SUBDIR+=	who
 .endif
 
-.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64" || \
-    ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "i386" || \
-    (${MACHINE_ARCH} == "armv6" && ${COMPILER_TYPE} == "clang")
 .if ${MK_SVN} == "yes" || ${MK_SVNLITE} == "yes"
 SUBDIR+=	svn
 .endif
-.endif
 
 .include <bsd.arch.inc.mk>
 
diff --git a/usr.bin/svn/lib/libapr/apr_private.h b/usr.bin/svn/lib/libapr/apr_private.h
index fcbbbd30cb2..492a4f1df0c 100644
--- a/usr.bin/svn/lib/libapr/apr_private.h
+++ b/usr.bin/svn/lib/libapr/apr_private.h
@@ -97,7 +97,9 @@
 #define HAVE_ARPA_INET_H 1
 
 /* Define if compiler provides atomic builtins */
+#if !defined(__mips__) && !defined(__arm__)
 #define HAVE_ATOMIC_BUILTINS 1
+#endif
 
 /* Define if BONE_VERSION is defined in sys/socket.h */
 /* #undef HAVE_BONE_VERSION */
diff --git a/usr.bin/svn/svn_private_config.h b/usr.bin/svn/svn_private_config.h
index 00eb0fc5d5e..061109534b7 100644
--- a/usr.bin/svn/svn_private_config.h
+++ b/usr.bin/svn/svn_private_config.h
@@ -153,7 +153,7 @@
 #define SVN_FS_WANT_DB_PATCH 14
 
 /* Define if compiler provides atomic builtins */
-#define SVN_HAS_ATOMIC_BUILTINS 1
+#define SVN_HAS_ATOMIC_BUILTINS 0
 
 /* Is GNOME Keyring support enabled? */
 /* #undef SVN_HAVE_GNOME_KEYRING */