diff --git a/changes/bug3643 b/changes/bug3643
new file mode 100644
index 000000000..86bd920ca
--- /dev/null
+++ b/changes/bug3643
@@ -0,0 +1,4 @@
+  o Minor bugfixes:
+    - Selectively disable deprecation warnings on OS X because Lion started
+      deprecating the shipped copy of openssl. Fixes bug 3643.
+
diff --git a/configure.in b/configure.in
index aa2233d4e..4e8429845 100644
--- a/configure.in
+++ b/configure.in
@@ -906,6 +906,15 @@ else
   enable_gcc_warnings_advisory=no
 fi
 
+# OS X Lion started deprecating the system openssl. Let's just disable
+# all deprecation warnings on OS X.
+case "$host_os" in
+
+ darwin*)
+    CFLAGS="$CFLAGS -Wno-deprecated-declarations"
+    ;;
+esac
+
 # Add some more warnings which we use in development but not in the
 # released versions.  (Some relevant gcc versions can't handle these.)
 if test x$enable_gcc_warnings = xyes || test x$enable_gcc_warnings_advisory = xyes; then