diff --git a/autogen.sh b/autogen.sh
index 7912654ae3..a92efea339 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -37,7 +37,11 @@ fi
 if test ! \( -x .git/hooks/pre-commit -a -L .git/hooks/pre-commit \);
 then
     rm -f .git/hooks/pre-commit
-    ln -s ../../common/hooks/pre-commit.hook .git/hooks/pre-commit
+    if ! ln -s ../../common/hooks/pre-commit.hook .git/hooks/pre-commit 2> /dev/null
+    then
+        echo "Failed to create commit hook symlink, copying instead ..."
+        cp common/hooks/pre-commit.hook .git/hooks/pre-commit
+    fi
 fi
 
 # GNU gettext automake support doesn't get along with git.
diff --git a/common b/common
index b3199090fa..86e46630ed 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit b3199090fa16a545d585a54deaa61b687ac369e1
+Subproject commit 86e46630ed8af8d94796859db550a9c3d89c9f65