diff --git a/ext/calendar/jewish.c b/ext/calendar/jewish.c
index bdfc9b4f91016..2fbdcb059b096 100644
--- a/ext/calendar/jewish.c
+++ b/ext/calendar/jewish.c
@@ -714,7 +714,7 @@ zend_long JewishToSdn(
 	int yearLength;
 	int lengthOfAdarIAndII;
 
-	if (year <= 0 || day <= 0 || day > 30) {
+	if (year <= 0 || year >= 6000 || day <= 0 || day > 30) {
 		return (0);
 	}
 	switch (month) {
diff --git a/ext/calendar/tests/gh16234_2.phpt b/ext/calendar/tests/gh16234_2.phpt
new file mode 100644
index 0000000000000..ab49744dddbbd
--- /dev/null
+++ b/ext/calendar/tests/gh16234_2.phpt
@@ -0,0 +1,11 @@
+--TEST--
+GH-16234 jewishtojd overflow on year argument
+--EXTENSIONS--
+calendar
+--FILE--
+<?php
+jewishtojd(10, 6, 2147483647);
+echo "DONE";
+?>
+--EXPECT--
+DONE