diff --git a/debian/changelog b/debian/changelog
index d6964ceb..94abea27 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+llvm-toolchain-7 (1:7-9) UNRELEASED; urgency=medium
+
+  * Update the clang manpage to remove osx specific options
+    and to add -arch (Closes: #743133)
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 04 Nov 2018 18:07:23 +0100
+
 llvm-toolchain-7 (1:7-8) unstable; urgency=medium
 
   * Update the watch file to display the right version
diff --git a/debian/patches/remove-apple-clang-manpage.diff b/debian/patches/remove-apple-clang-manpage.diff
new file mode 100644
index 00000000..71d176c3
--- /dev/null
+++ b/debian/patches/remove-apple-clang-manpage.diff
@@ -0,0 +1,38 @@
+Index: llvm-toolchain-7-7/clang/docs/CommandGuide/clang.rst
+===================================================================
+--- llvm-toolchain-7-7.orig/clang/docs/CommandGuide/clang.rst
++++ llvm-toolchain-7-7/clang/docs/CommandGuide/clang.rst
+@@ -310,20 +310,10 @@ Clang fully supports cross compilation a
+ Depending on how your version of Clang is configured, it may have support for a
+ number of cross compilers, or may only support a native target.
+ 
+-.. option:: -arch <architecture>
++.. option:: -target <architecture>
+ 
+   Specify the architecture to build for.
+ 
+-.. option:: -mmacosx-version-min=<version>
+-
+-  When building for Mac OS X, specify the minimum version supported by your
+-  application.
+-
+-.. option:: -miphoneos-version-min
+-
+-  When building for iPhone OS, specify the minimum version supported by your
+-  application.
+-
+ .. option:: -march=<cpu>
+ 
+   Specify that Clang should generate code for a specific processor family
+@@ -616,11 +606,6 @@ ENVIRONMENT
+   These environment variables specify additional paths, as for :envvar:`CPATH`, which are
+   only used when processing the appropriate language.
+ 
+-.. envvar:: MACOSX_DEPLOYMENT_TARGET
+-
+-  If :option:`-mmacosx-version-min` is unspecified, the default deployment
+-  target is read from this environment variable. This option only affects
+-  Darwin targets.
+ 
+ BUGS
+ ----
diff --git a/debian/patches/series b/debian/patches/series
index 4878c8af..caadc11e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -83,3 +83,4 @@ hurd-lib_Support_Unix_Path.inc.diff
 hurd-tools_llvm-shlib_CMakeLists.txt.diff
 rustc-aarch64-test-failure.diff
 symbolizer-path.diff
+remove-apple-clang-manpage.diff