diff --git a/ChangeLog b/ChangeLog
index f07b4cfe..d6b917da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,8 @@ Version 1.1.0
 
     Fixed issue #19: option for setting the proxy (Clint Berry, Ariya Hidayat).
 
+    Fixed issue #60: Win32 and OS/2 icon files (Salvador Parra Camacho).
+
 2011-01-17: Version 1.0.0
 
     Initial launch.
diff --git a/src/phantomjs.pro b/src/phantomjs.pro
index de73d354..8848c1ee 100644
--- a/src/phantomjs.pro
+++ b/src/phantomjs.pro
@@ -8,3 +8,6 @@ QT += network webkit
 CONFIG += console
 
 include(gif/gif.pri)
+
+win32: RC_FILE = phantomjs_win.rc
+os2:   RC_FILE = phantomjs_os2.rc
diff --git a/src/phantomjs_os2.ico b/src/phantomjs_os2.ico
new file mode 100644
index 00000000..86fd175d
Binary files /dev/null and b/src/phantomjs_os2.ico differ
diff --git a/src/phantomjs_os2.rc b/src/phantomjs_os2.rc
new file mode 100644
index 00000000..4b90e9c2
--- /dev/null
+++ b/src/phantomjs_os2.rc
@@ -0,0 +1 @@
+ICON 1 "phantomjs_os2.ico"
\ No newline at end of file
diff --git a/src/phantomjs_win.ico b/src/phantomjs_win.ico
new file mode 100644
index 00000000..cc296c74
Binary files /dev/null and b/src/phantomjs_win.ico differ
diff --git a/src/phantomjs_win.rc b/src/phantomjs_win.rc
new file mode 100644
index 00000000..3381c6a0
--- /dev/null
+++ b/src/phantomjs_win.rc
@@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "phantomjs_win.ico"
\ No newline at end of file