diff --git a/Makefile b/Makefile
index e293477e..baf9ce41 100644
--- a/Makefile
+++ b/Makefile
@@ -185,11 +185,27 @@ endif
 
 # ----------
 
+# Phony targets
+.PHONY : all client game icon refresher server
+
+# ----------
+
 # Builds everything
 all: client server refresher game
 
 # ----------
 
+# Special target to compile
+# the icon on Windows
+ifeq ($(OSTYPE), Windows)
+icon:
+	@echo "===> WR build/icon/icon.res"
+	${Q}stuff/misc/mkdir -p build/icon
+	${Q}windres stuff\icon\icon.rc -O COFF -o build\icon\icon.res
+endif
+
+# ----------
+
 # Cleanup
 ifeq ($(OSTYPE), Windows)
 clean:
@@ -641,9 +657,9 @@ GAME_DEPS= $(GAME_OBJS:.o=.d)
 
 # release/quake2
 ifeq ($(OSTYPE), Windows)
-release/quake2.exe : $(CLIENT_OBJS)
+release/quake2.exe : $(CLIENT_OBJS) icon
 	@echo "===> LD $@"
-	${Q}$(CC) $(CLIENT_OBJS) $(LDFLAGS) $(SDLLDFLAGS) -o $@
+	${Q}$(CC) build/icon/icon.res $(CLIENT_OBJS) $(LDFLAGS) $(SDLLDFLAGS) -o $@
 else
 release/quake2 : $(CLIENT_OBJS)
 	@echo "===> LD $@"
@@ -652,9 +668,9 @@ endif
  
 # release/q2ded
 ifeq ($(OSTYPE), Windows)
-release/q2ded.exe : $(SERVER_OBJS)
+release/q2ded.exe : $(SERVER_OBJS) icon
 	@echo "===> LD $@.exe"
-	${Q}$(CC) $(SERVER_OBJS) $(LDFLAGS) -o $@
+	${Q}$(CC) build/icon/icon.res $(SERVER_OBJS) $(LDFLAGS) -o $@
 else
 release/q2ded : $(SERVER_OBJS)
 	@echo "===> LD $@"
diff --git a/stuff/icon/Quake2.ico b/stuff/icon/Quake2.ico
new file mode 100644
index 00000000..9879706c
Binary files /dev/null and b/stuff/icon/Quake2.ico differ
diff --git a/icon/Quake2.png b/stuff/icon/Quake2.png
similarity index 100%
rename from icon/Quake2.png
rename to stuff/icon/Quake2.png
diff --git a/stuff/icon/icon.rc b/stuff/icon/icon.rc
new file mode 100644
index 00000000..fca3d2e9
--- /dev/null
+++ b/stuff/icon/icon.rc
@@ -0,0 +1 @@
+id ICON "stuff/icon/Quake2.ico"