diff --git a/src/cc65/error.c b/src/cc65/error.c
index 132bf331d..feb43565d 100644
--- a/src/cc65/error.c
+++ b/src/cc65/error.c
@@ -74,6 +74,7 @@ IntStack WarnUnknownPragma  = INTSTACK(1);  /* - unknown #pragmas */
 IntStack WarnUnusedLabel    = INTSTACK(1);  /* - unused labels */
 IntStack WarnUnusedParam    = INTSTACK(1);  /* - unused parameters */
 IntStack WarnUnusedVar      = INTSTACK(1);  /* - unused variables */
+IntStack WarnReturnType     = INTSTACK(1);  /* - control reaches end of non-void function */
 
 /* Map the name of a warning to the intstack that holds its state */
 typedef struct WarnMapEntry WarnMapEntry;
@@ -92,6 +93,7 @@ static WarnMapEntry WarnMap[] = {
     { &WarnUnusedLabel,         "unused-label"          },
     { &WarnUnusedParam,         "unused-param"          },
     { &WarnUnusedVar,           "unused-var"            },
+    { &WarnReturnType,          "return-type"           },
 };
 
 Collection DiagnosticStrBufs;
diff --git a/src/cc65/error.h b/src/cc65/error.h
index a443aeff8..898793651 100644
--- a/src/cc65/error.h
+++ b/src/cc65/error.h
@@ -71,6 +71,7 @@ extern IntStack WarnUnknownPragma;      /* - unknown #pragmas */
 extern IntStack WarnUnusedLabel;        /* - unused labels */
 extern IntStack WarnUnusedParam;        /* - unused parameters */
 extern IntStack WarnUnusedVar;          /* - unused variables */
+extern IntStack WarnReturnType;         /* - control reaches end of non-void function */
 
 /* Forward */
 struct StrBuf;
diff --git a/src/cc65/function.c b/src/cc65/function.c
index 00755ae65..9269d4c62 100644
--- a/src/cc65/function.c
+++ b/src/cc65/function.c
@@ -654,8 +654,8 @@ void NewFunc (SymEntry* Func, FuncDesc* D)
     ** environment returning int, output a warning if we didn't see a return
     ** statement.
     */
-    if (!F_HasVoidReturn (CurrentFunc) && !F_HasReturn (CurrentFunc) && !C99MainFunc) {
-        Warning ("Control reaches end of non-void function");
+    if (!F_HasVoidReturn (CurrentFunc) && !F_HasReturn (CurrentFunc) && !C99MainFunc && IS_Get (&WarnReturnType)) {
+        Warning ("Control reaches end of non-void function [-Wreturn-type]");
     }
 
     /* If this is the main function in a C99 environment returning an int, let