diff --git a/src/Makefile b/src/Makefile
index 56224f96..aad9a4eb 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -50,8 +50,8 @@ ifdef COMSPEC
   RMDIR = rmdir --ignore-fail-on-non-empty
   CP = cp
   BIN = ../bin/grafx2.exe
-  COPT = -W -Wall -Wdeclaration-after-statement -O$(OPTIM) -g -ggdb $(shell sdl-config --cflags) $(TTFCOPT) $(JOYCOPT) $(VKEYCOPT) $(LUACOPT) $(LAYERCOPT)
-  LOPT = $(shell sdl-config --libs) -lSDL_image $(TTFLOPT) -lpng14 $(LUALOPT)
+  COPT = -W -Wall -Wdeclaration-after-statement -O$(OPTIM) -g -ggdb `sdl-config --cflags` $(TTFCOPT) $(JOYCOPT) $(VKEYCOPT) $(LUACOPT) $(LAYERCOPT)
+  LOPT = `sdl-config --libs` -lSDL_image $(TTFLOPT) -lpng14 $(LUALOPT)
   LUALOPT = -llua
   CC = gcc
   OBJDIR = ../obj/win32
diff --git a/src/factory.c b/src/factory.c
index 2bf8f503..7b2521c3 100644
--- a/src/factory.c
+++ b/src/factory.c
@@ -1232,13 +1232,15 @@ int L_WaitInput(lua_State* L)
   lua_pushinteger(L, Mouse_X);
   lua_pushinteger(L, Mouse_Y);
   lua_pushinteger(L, Mouse_K);
+  lua_pushinteger(L, Paintbrush_X);
+  lua_pushinteger(L, Paintbrush_Y);
   
   // The event arguments are in the stack.
   // Need to reset "Key" here, so that a key event will not be
   // created again before an actual key repeat occurs.
   Key=0;
   
-  return 5;
+  return 7;
 }
 
 int L_UpdateScreen(lua_State* L)