diff --git a/NEWS.txt b/NEWS.txt
index 9575c1f0..c38fd1b4 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -3,6 +3,7 @@ Version 5.9.2 - 1 Februari 2015
 - Changed Format Current File shortcut from Shift+F to Shift+Ctrl+A.
 - Removed/Changed all default Alt+(Key) shortcuts because they interfere with Alt menu navigation.
 - Assigned some new default shortcuts like Ctrl+B (Open Containing Folder) and F2 (Rename File).
+- Fixed Show Makefile being executable when no compiler set is configured.
 
 Version 5.9.1 - 31 Januari 2015
 
diff --git a/Source/TODO.txt b/Source/TODO.txt
index 4e535b63..a73ae801 100644
--- a/Source/TODO.txt
+++ b/Source/TODO.txt
@@ -8,4 +8,5 @@
 - Messy painting of find results list
 - Add proxy support to webupdate
 - Unify look and feel of all windows
-- Test TDM-GCC 4.9.x
\ No newline at end of file
+- Test TDM-GCC 4.9.x
+- Rename file
\ No newline at end of file
diff --git a/Source/main.dfm b/Source/main.dfm
index 1b7a1ab6..55e66544 100644
--- a/Source/main.dfm
+++ b/Source/main.dfm
@@ -2150,7 +2150,7 @@ object MainForm: TMainForm
       Category = 'Project'
       Caption = 'Edit &Makefile'
       OnExecute = actProjectMakeFileExecute
-      OnUpdate = actUpdateProject
+      OnUpdate = actUpdateMakeFile
     end
     object actProjectSource: TAction
       Tag = 6
diff --git a/Source/main.pas b/Source/main.pas
index 030540f3..312ff179 100644
--- a/Source/main.pas
+++ b/Source/main.pas
@@ -611,6 +611,7 @@   TMainForm = class(TForm)
     procedure actMsgHideExecute(Sender: TObject);
     procedure actUpdatePageCount(Sender: TObject); // enable on pagecount> 0
     procedure actUpdateProject(Sender: TObject); // enable on fproject assigned
+    procedure actUpdateMakeFile(Sender: TObject); // enable on fproject assigned and compilation allowed
     procedure actUpdatePageorProject(Sender: TObject); // enable on either of above
     procedure actUpdateEmptyEditor(Sender: TObject); // enable on unempty editor
     procedure actUpdateDebuggerRunning(Sender: TObject); // enable when debugger running
@@ -3222,6 +3223,12 @@ procedure TMainForm.actUpdateProject(Sender: TObject);
   TCustomAction(Sender).Enabled := assigned(fProject);
 end;
 
+procedure TMainForm.actUpdateMakeFile(Sender: TObject);
+begin
+  TCustomAction(Sender).Enabled := assigned(fProject) and (not fCompiler.Compiling) and (GetCompileTarget <> ctNone) and
+    Assigned(devCompilerSets.CompilationSet);
+end;
+
 procedure TMainForm.actUpdateEmptyEditor(Sender: TObject);
 var
   e: TEditor;