diff --git a/BasiliskII/src/MacOSX/BasiliskII.xcodeproj/project.pbxproj b/BasiliskII/src/MacOSX/BasiliskII.xcodeproj/project.pbxproj
index 8f794357..3c95f13b 100644
--- a/BasiliskII/src/MacOSX/BasiliskII.xcodeproj/project.pbxproj
+++ b/BasiliskII/src/MacOSX/BasiliskII.xcodeproj/project.pbxproj
@@ -1055,7 +1055,7 @@
 				LIBRARY_SEARCH_PATHS = /usr/local/lib;
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				ONLY_ACTIVE_ARCH = NO;
-				OTHER_CFLAGS = "";
+				OTHER_CFLAGS = "-fwrapv";
 				OTHER_LDFLAGS = "";
 				"OTHER_LDFLAGS[arch=arm64]" = (
 					"-luae_cpu_arm64",
@@ -1139,7 +1139,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				LIBRARY_SEARCH_PATHS = /usr/local/lib;
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
-				OTHER_CFLAGS = "";
+				OTHER_CFLAGS = "-fwrapv";
 				OTHER_LDFLAGS = "";
 				"OTHER_LDFLAGS[arch=arm64]" = (
 					"-luae_cpu_arm64",
diff --git a/BasiliskII/src/Unix/configure.ac b/BasiliskII/src/Unix/configure.ac
index 78966179..45f5e2df 100644
--- a/BasiliskII/src/Unix/configure.ac
+++ b/BasiliskII/src/Unix/configure.ac
@@ -1902,6 +1902,9 @@ if [[ "x$HAVE_IPA" = "xyes" ]]; then
   LDFLAGS="$LDFLAGS -O3 -OPT:Olimit=0 -IPA"
 fi
 
+CFLAGS="$CFLAGS -fwrapv"
+CXXFLAGS="$CXXFLAGS -fwrapv"
+
 dnl Generate Makefile.
 AC_SUBST(DEFINES)
 AC_SUBST(SYSSRCS)
diff --git a/BasiliskII/src/Windows/configure.ac b/BasiliskII/src/Windows/configure.ac
index b747bcaf..95c8e18a 100644
--- a/BasiliskII/src/Windows/configure.ac
+++ b/BasiliskII/src/Windows/configure.ac
@@ -567,6 +567,9 @@ if [[ "x$HAVE_GCC27" = "xyes" ]]; then
   CXXFLAGS=`echo $CXXFLAGS | sed -e 's/-g\b//g'`
 fi
 
+CFLAGS="$CFLAGS -fwrapv"
+CXXFLAGS="$CXXFLAGS -fwrapv"
+
 dnl Generate Makefile.
 AC_SUBST(DEFINES)
 AC_SUBST(CPUINCLUDES)