diff --git a/aconfigure b/aconfigure
index 81c1e45e8..d4e811a27 100755
--- a/aconfigure
+++ b/aconfigure
@@ -8836,7 +8836,15 @@ $as_echo "Checking if libwebrtc is disabled...no" >&6; }
 			ac_webrtc_cflags="-msse2"
 			;;
 		     *win32* | *w32* | *darwin* | *linux*)
-			ac_webrtc_instset=sse2
+                         case $target in
+                             armv7l*gnueabihf)
+                                 ac_webrtc_instset=neon
+                                 ac_webrtc_cflags="-DWEBRTC_ARCH_ARMV7 -mfloat-abi=hard -mfpu=neon"
+                                 ;;
+                             *)
+                                 ac_webrtc_instset=sse2
+                                 ;;
+                         esac
 			;;
 		     *)
 			;;
diff --git a/aconfigure.ac b/aconfigure.ac
index 388f803fd..4d6cba04c 100644
--- a/aconfigure.ac
+++ b/aconfigure.ac
@@ -1999,7 +1999,15 @@ AC_ARG_ENABLE(libwebrtc,
 			ac_webrtc_cflags="-msse2"
 			;;
 		     *win32* | *w32* | *darwin* | *linux*)
-			ac_webrtc_instset=sse2
+                         case $target in
+                             armv7l*gnueabihf)
+                                 ac_webrtc_instset=neon
+                                 ac_webrtc_cflags="-DWEBRTC_ARCH_ARMV7 -mfloat-abi=hard -mfpu=neon"
+                                 ;;
+                             *)
+                                 ac_webrtc_instset=sse2
+                                 ;;
+                         esac
 			;;
 		     *)
 			;;