diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index d362825156d8..0270daa81485 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 09 Sep 2016 10:40:35 +0000
+Fri, 09 Sep 2016 12:10:38 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index d362825156d8..0270daa81485 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 09 Sep 2016 10:40:35 +0000
+Fri, 09 Sep 2016 12:10:38 +0000
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index d362825156d8..0270daa81485 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 09 Sep 2016 10:40:35 +0000
+Fri, 09 Sep 2016 12:10:38 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 183e115bab20..98c6105aeef8 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Sep  9 10:39:40 UTC 2016
+Fri Sep  9 12:09:43 UTC 2016
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index e6b36be5f394..fc25c4b03e2b 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 09 Sep 2016 11:00:01 +0000
+Fri, 09 Sep 2016 12:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index fe27fc5d01f0..d7e6edb98ac8 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1473417601 Fri 09 Sep 2016 10:40:01 AM UTC
+1473423001 Fri 09 Sep 2016 12:10:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index d362825156d8..0270daa81485 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 09 Sep 2016 10:40:35 +0000
+Fri, 09 Sep 2016 12:10:38 +0000
diff --git a/profiles/package.mask b/profiles/package.mask
index 87f1b8319843..d68dda77f5c3 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -30,6 +30,15 @@
 
 #--- END OF EXAMPLES ---
 
+# Martin Gysel <me@bearsh.org> via g-p-m (09 Sep 2016)
+# Versions currently in Portage are old and block removal of other
+# packages. Current versions require building against modified versions
+# of dev-libs/libdivecomputer and kde-apps/marble which must be fetched
+# from Git, and which are not versioned (upstream uses branch tags).
+# Finally, upstream considers distribution-maintained packages deprecated.
+# Removal in 30 days.
+app-misc/subsurface
+
 # Alon Bar-Lev <alonbl@gentoo.org (09 Sep 2016)
 # No upstream, no maintainer (bug #592164)
 # Package will be removed from Gentoo in 30 days.