diff --git a/UPGRADING b/UPGRADING
index 153d5b2c10a..953866a9a1d 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -46,6 +46,10 @@ PHP 7.2 UPGRADE NOTES
 4. Deprecated Functionality
 ========================================
 
+- GD:
+  . png2wbmp() and jpeg2wbmp() have been deprecated, and will be removed as of
+    PHP 8.0.0.
+
 ========================================
 5. Changed Functions
 ========================================
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index b957d75586a..25fb20babca 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -972,10 +972,10 @@ const zend_function_entry gd_functions[] = {
 	PHP_FE(imagetypes,								arginfo_imagetypes)
 
 #if defined(HAVE_GD_JPG)
-	PHP_FE(jpeg2wbmp,								arginfo_jpeg2wbmp)
+	PHP_DEP_FE(jpeg2wbmp,							arginfo_jpeg2wbmp)
 #endif
 #if defined(HAVE_GD_PNG)
-	PHP_FE(png2wbmp,								arginfo_png2wbmp)
+	PHP_DEP_FE(png2wbmp,							arginfo_png2wbmp)
 #endif
 	PHP_FE(image2wbmp,								arginfo_image2wbmp)
 	PHP_FE(imagelayereffect,						arginfo_imagelayereffect)
diff --git a/ext/gd/tests/jpeg2wbmp_error1.phpt b/ext/gd/tests/jpeg2wbmp_error1.phpt
index d0496cc82bd..2368e7549f0 100644
--- a/ext/gd/tests/jpeg2wbmp_error1.phpt
+++ b/ext/gd/tests/jpeg2wbmp_error1.phpt
@@ -32,8 +32,12 @@ jpeg2wbmp($file, $file2, 20, 120, 9);
 jpeg2wbmp($file, $file2, 20, 120, -1);
 ?>
 --EXPECTF--
+Deprecated: Function jpeg2wbmp() is deprecated in %s on line %d
+
 Warning: jpeg2wbmp(): Invalid threshold value '9' in %s on line %d
 
+Deprecated: Function jpeg2wbmp() is deprecated in %s on line %d
+
 Warning: jpeg2wbmp(): Invalid threshold value '-1' in %s on line %d
 --CLEAN--
 <?php
diff --git a/ext/gd/tests/jpeg2wbmp_error2-mb.phpt b/ext/gd/tests/jpeg2wbmp_error2-mb.phpt
index a1c91b13971..b414cb35aae 100644
--- a/ext/gd/tests/jpeg2wbmp_error2-mb.phpt
+++ b/ext/gd/tests/jpeg2wbmp_error2-mb.phpt
@@ -20,10 +20,16 @@ jpeg2wbmp(null, $file, 20, 120, 8);
 jpeg2wbmp(false, $file, 20, 120, 8);
 ?>
 --EXPECTF--
-Warning: jpeg2wbmp(): Unable to open '' for reading in %s on line %d
+Deprecated: Function jpeg2wbmp() is deprecated in %s on line %d
 
 Warning: jpeg2wbmp(): Unable to open '' for reading in %s on line %d
 
+Deprecated: Function jpeg2wbmp() is deprecated in %s on line %d
+
+Warning: jpeg2wbmp(): Unable to open '' for reading in %s on line %d
+
+Deprecated: Function jpeg2wbmp() is deprecated in %s on line %d
+
 Warning: jpeg2wbmp(): Unable to open '' for reading in %s on line %d
 --CLEAN--
 <?php
diff --git a/ext/gd/tests/jpeg2wbmp_error2.phpt b/ext/gd/tests/jpeg2wbmp_error2.phpt
index 692dcb842d9..22e2301d993 100644
--- a/ext/gd/tests/jpeg2wbmp_error2.phpt
+++ b/ext/gd/tests/jpeg2wbmp_error2.phpt
@@ -20,10 +20,16 @@ jpeg2wbmp(null, $file, 20, 120, 8);
 jpeg2wbmp(false, $file, 20, 120, 8);
 ?>
 --EXPECTF--
-Warning: jpeg2wbmp(): Unable to open '' for reading in %s on line %d
+Deprecated: Function jpeg2wbmp() is deprecated in %s on line %d
 
 Warning: jpeg2wbmp(): Unable to open '' for reading in %s on line %d
 
+Deprecated: Function jpeg2wbmp() is deprecated in %s on line %d
+
+Warning: jpeg2wbmp(): Unable to open '' for reading in %s on line %d
+
+Deprecated: Function jpeg2wbmp() is deprecated in %s on line %d
+
 Warning: jpeg2wbmp(): Unable to open '' for reading in %s on line %d
 --CLEAN--
 <?php
diff --git a/ext/gd/tests/jpeg2wbmp_error3.phpt b/ext/gd/tests/jpeg2wbmp_error3.phpt
index df436c8cc3d..e15c94765f2 100644
--- a/ext/gd/tests/jpeg2wbmp_error3.phpt
+++ b/ext/gd/tests/jpeg2wbmp_error3.phpt
@@ -32,10 +32,16 @@ jpeg2wbmp($file, null, 20, 120, 8);
 jpeg2wbmp($file, false, 20, 120, 8);
 ?>
 --EXPECTF--
-Warning: jpeg2wbmp(): Unable to open '' for writing in %s on line %d
+Deprecated: Function jpeg2wbmp() is deprecated in %s on line %d
 
 Warning: jpeg2wbmp(): Unable to open '' for writing in %s on line %d
 
+Deprecated: Function jpeg2wbmp() is deprecated in %s on line %d
+
+Warning: jpeg2wbmp(): Unable to open '' for writing in %s on line %d
+
+Deprecated: Function jpeg2wbmp() is deprecated in %s on line %d
+
 Warning: jpeg2wbmp(): Unable to open '' for writing in %s on line %d
 --CLEAN--
 <?php
diff --git a/ext/gd/tests/png2wbmp_error1-mb.phpt b/ext/gd/tests/png2wbmp_error1-mb.phpt
index a19cf5e0178..a16e1a67c66 100644
--- a/ext/gd/tests/png2wbmp_error1-mb.phpt
+++ b/ext/gd/tests/png2wbmp_error1-mb.phpt
@@ -32,8 +32,12 @@ png2wbmp($file, $file2, 20, 120, 9);
 png2wbmp($file, $file2, 20, 120, -1);
 ?>
 --EXPECTF--
+Deprecated: Function png2wbmp() is deprecated in %s on line %d
+
 Warning: png2wbmp(): Invalid threshold value '9' in %s on line %d
 
+Deprecated: Function png2wbmp() is deprecated in %s on line %d
+
 Warning: png2wbmp(): Invalid threshold value '-1' in %s on line %d
 --CLEAN--
 <?php
diff --git a/ext/gd/tests/png2wbmp_error1.phpt b/ext/gd/tests/png2wbmp_error1.phpt
index 1e9d717d94e..e3496a45c93 100644
--- a/ext/gd/tests/png2wbmp_error1.phpt
+++ b/ext/gd/tests/png2wbmp_error1.phpt
@@ -32,8 +32,12 @@ png2wbmp($file, $file2, 20, 120, 9);
 png2wbmp($file, $file2, 20, 120, -1);
 ?>
 --EXPECTF--
+Deprecated: Function png2wbmp() is deprecated in %s on line %d
+
 Warning: png2wbmp(): Invalid threshold value '9' in %s on line %d
 
+Deprecated: Function png2wbmp() is deprecated in %s on line %d
+
 Warning: png2wbmp(): Invalid threshold value '-1' in %s on line %d
 --CLEAN--
 <?php
diff --git a/ext/gd/tests/png2wbmp_error2.phpt b/ext/gd/tests/png2wbmp_error2.phpt
index ba8e43e7f0e..71912b61983 100644
--- a/ext/gd/tests/png2wbmp_error2.phpt
+++ b/ext/gd/tests/png2wbmp_error2.phpt
@@ -20,10 +20,16 @@ png2wbmp(null, $file, 20, 120, 8);
 png2wbmp(false, $file, 20, 120, 8);
 ?>
 --EXPECTF--
-Warning: png2wbmp(): Unable to open '' for reading in %s on line %d
+Deprecated: Function png2wbmp() is deprecated in %s on line %d
 
 Warning: png2wbmp(): Unable to open '' for reading in %s on line %d
 
+Deprecated: Function png2wbmp() is deprecated in %s on line %d
+
+Warning: png2wbmp(): Unable to open '' for reading in %s on line %d
+
+Deprecated: Function png2wbmp() is deprecated in %s on line %d
+
 Warning: png2wbmp(): Unable to open '' for reading in %s on line %d
 --CLEAN--
 <?php
diff --git a/ext/gd/tests/png2wbmp_error3.phpt b/ext/gd/tests/png2wbmp_error3.phpt
index 1e33f59b184..53ffb543197 100644
--- a/ext/gd/tests/png2wbmp_error3.phpt
+++ b/ext/gd/tests/png2wbmp_error3.phpt
@@ -32,10 +32,16 @@ png2wbmp($file, null, 20, 120, 8);
 png2wbmp($file, false, 20, 120, 8);
 ?>
 --EXPECTF--
-Warning: png2wbmp(): Unable to open '' for writing in %s on line %d
+Deprecated: Function png2wbmp() is deprecated in %s on line %d
 
 Warning: png2wbmp(): Unable to open '' for writing in %s on line %d
 
+Deprecated: Function png2wbmp() is deprecated in %s on line %d
+
+Warning: png2wbmp(): Unable to open '' for writing in %s on line %d
+
+Deprecated: Function png2wbmp() is deprecated in %s on line %d
+
 Warning: png2wbmp(): Unable to open '' for writing in %s on line %d
 --CLEAN--
 <?php