diff --git a/Zend/Makefile.frag b/Zend/Makefile.frag
index cca9c2c697f..6f43ffa52b8 100644
--- a/Zend/Makefile.frag
+++ b/Zend/Makefile.frag
@@ -5,8 +5,8 @@
 $(builddir)/zend_language_scanner.lo: $(srcdir)/zend_language_parser.h
 $(builddir)/zend_ini_scanner.lo: $(srcdir)/zend_ini_parser.h
 
-$(srcdir)/zend_language_scanner.c: $(srcdir)/zend_language_scanner.l
-	@(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt Zend/zend_language_scanner_defs.h -oZend/zend_language_scanner.c Zend/zend_language_scanner.l)
+$(srcdir)/zend_language_scanner.c: $(srcdir)/zend_language_scanner.re
+	@(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt Zend/zend_language_scanner_defs.h -oZend/zend_language_scanner.c Zend/zend_language_scanner.re)
 
 $(srcdir)/zend_language_parser.h: $(srcdir)/zend_language_parser.c
 $(srcdir)/zend_language_parser.c: $(srcdir)/zend_language_parser.y
@@ -16,8 +16,8 @@ $(srcdir)/zend_ini_parser.h: $(srcdir)/zend_ini_parser.c
 $(srcdir)/zend_ini_parser.c: $(srcdir)/zend_ini_parser.y
 	@$(YACC) -p ini_ -v -d $(srcdir)/zend_ini_parser.y -o $@
 
-$(srcdir)/zend_ini_scanner.c: $(srcdir)/zend_ini_scanner.l
-	@(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt Zend/zend_ini_scanner_defs.h -oZend/zend_ini_scanner.c Zend/zend_ini_scanner.l)
+$(srcdir)/zend_ini_scanner.c: $(srcdir)/zend_ini_scanner.re
+	@(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt Zend/zend_ini_scanner_defs.h -oZend/zend_ini_scanner.c Zend/zend_ini_scanner.re)
 
 $(builddir)/zend_highlight.lo $(builddir)/zend_compile.lo: $(srcdir)/zend_language_parser.h
 
diff --git a/Zend/tests/bug70748.phpt b/Zend/tests/bug70748.phpt
index feb0e2a59df..9c23c0e84e4 100644
--- a/Zend/tests/bug70748.phpt
+++ b/Zend/tests/bug70748.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #70748 (Segfault in ini_lex () at Zend/zend_ini_scanner.l)
+Bug #70748 (Segfault in ini_lex () at Zend/zend_ini_scanner.re)
 --FILE--
 <?php
 $ini = '[${ 	';
diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
index 963314ced81..3f9d5145172 100644
--- a/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@ -759,7 +759,7 @@ ZEND_API void function_add_ref(zend_function *function);
 #define INITIAL_OP_ARRAY_SIZE 64
 
 
-/* helper functions in zend_language_scanner.l */
+/* helper functions in zend_language_scanner.re */
 ZEND_API zend_op_array *compile_file(zend_file_handle *file_handle, int type);
 ZEND_API zend_op_array *compile_string(zval *source_string, char *filename);
 ZEND_API zend_op_array *compile_filename(int type, zval *filename);
diff --git a/Zend/zend_ini_scanner.l b/Zend/zend_ini_scanner.re
similarity index 100%
rename from Zend/zend_ini_scanner.l
rename to Zend/zend_ini_scanner.re
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.re
similarity index 100%
rename from Zend/zend_language_scanner.l
rename to Zend/zend_language_scanner.re
diff --git a/sapi/phpdbg/Makefile.frag b/sapi/phpdbg/Makefile.frag
index 65377e608a6..c1054197020 100644
--- a/sapi/phpdbg/Makefile.frag
+++ b/sapi/phpdbg/Makefile.frag
@@ -9,12 +9,12 @@ $(BUILD_BINARY): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS)
 	$(BUILD_PHPDBG)
 
 %.c: %.y
-%.c: %.l
+%.c: %.re
 
 $(builddir)/phpdbg_lexer.lo: $(srcdir)/phpdbg_parser.h
 
-$(srcdir)/phpdbg_lexer.c: $(srcdir)/phpdbg_lexer.l
-	@(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date -cbdFo sapi/phpdbg/phpdbg_lexer.c sapi/phpdbg/phpdbg_lexer.l)
+$(srcdir)/phpdbg_lexer.c: $(srcdir)/phpdbg_lexer.re
+	@(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date -cbdFo sapi/phpdbg/phpdbg_lexer.c sapi/phpdbg/phpdbg_lexer.re)
 
 $(srcdir)/phpdbg_parser.h: $(srcdir)/phpdbg_parser.c
 $(srcdir)/phpdbg_parser.c: $(srcdir)/phpdbg_parser.y
diff --git a/sapi/phpdbg/phpdbg_lexer.l b/sapi/phpdbg/phpdbg_lexer.re
similarity index 99%
rename from sapi/phpdbg/phpdbg_lexer.l
rename to sapi/phpdbg/phpdbg_lexer.re
index 422cda4f2c0..214850942e7 100644
--- a/sapi/phpdbg/phpdbg_lexer.l
+++ b/sapi/phpdbg/phpdbg_lexer.re
@@ -1,5 +1,5 @@
 /*
- * phpdbg_lexer.l
+ * phpdbg_lexer.re
  */
 
 #include "phpdbg.h"
diff --git a/win32/build/Makefile b/win32/build/Makefile
index 26b73b625ac..9a8949c4251 100644
--- a/win32/build/Makefile
+++ b/win32/build/Makefile
@@ -89,14 +89,14 @@ sapi\phpdbg\phpdbg_parser.c sapi\phpdbg\phpdbg_parser.h: sapi\phpdbg\phpdbg_pars
 	$(BISON) --output=sapi/phpdbg/phpdbg_parser.c -v -d -p phpdbg_ sapi/phpdbg/phpdbg_parser.y
 
 !if $(RE2C) != ""
-Zend\zend_ini_scanner.c: Zend\zend_ini_scanner.l
-	$(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt Zend/zend_ini_scanner_defs.h -oZend/zend_ini_scanner.c Zend/zend_ini_scanner.l
+Zend\zend_ini_scanner.c: Zend\zend_ini_scanner.re
+	$(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt Zend/zend_ini_scanner_defs.h -oZend/zend_ini_scanner.c Zend/zend_ini_scanner.re
 
-Zend\zend_language_scanner.c: Zend\zend_language_scanner.l
-	$(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt Zend/zend_language_scanner_defs.h -oZend/zend_language_scanner.c Zend/zend_language_scanner.l
+Zend\zend_language_scanner.c: Zend\zend_language_scanner.re
+	$(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt Zend/zend_language_scanner_defs.h -oZend/zend_language_scanner.c Zend/zend_language_scanner.re
 
-sapi\phpdbg\phpdbg_lexer.c: sapi\phpdbg\phpdbg_lexer.l
-	$(RE2C) $(RE2C_FLAGS) --no-generation-date -cbdFo sapi/phpdbg/phpdbg_lexer.c sapi/phpdbg/phpdbg_lexer.l
+sapi\phpdbg\phpdbg_lexer.c: sapi\phpdbg\phpdbg_lexer.re
+	$(RE2C) $(RE2C_FLAGS) --no-generation-date -cbdFo sapi/phpdbg/phpdbg_lexer.c sapi/phpdbg/phpdbg_lexer.re
 !endif
 
 !if "$(ZTS)" == "1"