diff --git a/CHANGELOG b/CHANGELOG
index d45a1497e..9611f8921 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -17,6 +17,9 @@ o Added NSE Datafiles library which reads and parses Nmap's nmap-*
   (e.g. port numbers) indexing names (e.g. service names).  The
   rpcinfo.nse script was also updated to use this library. [Kris]
 
+o Added many additional PCRE option flags to the list returned by the
+  NSE pcre.flags() function. [Kris]
+
 o Changed the NSE function nmap.set_port_state() so that it checks to
   see if the requested port is already in the requested state.  This
   prevents "Duplicate port" messages during the script scan and the
diff --git a/nse_pcrelib.cc b/nse_pcrelib.cc
index 0e4894503..133aeda9b 100644
--- a/nse_pcrelib.cc
+++ b/nse_pcrelib.cc
@@ -342,6 +342,45 @@ static flags_pair pcre_flags[] =
 #if PCRE_MAJOR >= 4
 	{ "NO_AUTO_CAPTURE", PCRE_NO_AUTO_CAPTURE },
 	{ "NO_UTF8_CHECK",   PCRE_NO_UTF8_CHECK },
+#endif
+#ifdef PCRE_AUTO_CALLOUT
+	{ "AUTO_CALLOUT",    PCRE_AUTO_CALLOUT },
+#endif
+#ifdef PCRE_PARTIAL
+	{ "PARTIAL",         PCRE_PARTIAL },
+#endif
+#ifdef PCRE_DFA_SHORTEST
+	{ "DFA_SHORTEST",    PCRE_DFA_SHORTEST },
+#endif
+#ifdef PCRE_DFA_RESTART
+	{ "DFA_RESTART",     PCRE_DFA_RESTART },
+#endif
+#ifdef PCRE_FIRSTLINE
+	{ "FIRSTLINE",       PCRE_FIRSTLINE },
+#endif
+#ifdef PCRE_DUPNAMES
+	{ "DUPNAMES",        PCRE_DUPNAMES },
+#endif
+#ifdef PCRE_NEWLINE_CR
+	{ "NEWLINE_CR",      PCRE_NEWLINE_CR },
+#endif
+#ifdef PCRE_NEWLINE_LF
+	{ "NEWLINE_LF",      PCRE_NEWLINE_LF },
+#endif
+#ifdef PCRE_NEWLINE_CRLF
+	{ "NEWLINE_CRLF",    PCRE_NEWLINE_CRLF },
+#endif
+#ifdef PCRE_NEWLINE_ANY
+	{ "NEWLINE_ANY",     PCRE_NEWLINE_ANY },
+#endif
+#ifdef PCRE_NEWLINE_ANYCRLF
+	{ "NEWLINE_ANYCRLF", PCRE_NEWLINE_ANYCRLF },
+#endif
+#ifdef PCRE_BSR_ANYCRLF
+	{ "BSR_ANYCRLF",     PCRE_BSR_ANYCRLF },
+#endif
+#ifdef PCRE_BSR_UNICODE
+	{ "BSR_UNICODE",     PCRE_BSR_UNICODE },
 #endif
 	{ NULL, 0 }
 };