diff --git a/dist/clementine.ico b/dist/clementine.ico
new file mode 100644
index 000000000..d4bfd4fb8
Binary files /dev/null and b/dist/clementine.ico differ
diff --git a/dist/clementine_16.png b/dist/clementine_16.png
new file mode 100644
index 000000000..c5ca2f5a5
Binary files /dev/null and b/dist/clementine_16.png differ
diff --git a/dist/clementine_32.png b/dist/clementine_32.png
new file mode 100644
index 000000000..efe40620e
Binary files /dev/null and b/dist/clementine_32.png differ
diff --git a/dist/windres.rc b/dist/windres.rc
new file mode 100644
index 000000000..5590d5726
--- /dev/null
+++ b/dist/windres.rc
@@ -0,0 +1,25 @@
+clementine ICON "clementine.ico"
+1 VERSIONINFO
+FILEVERSION     0,1,0,0
+PRODUCTVERSION  0,1,0,0
+BEGIN
+  BLOCK "StringFileInfo"
+  BEGIN
+    BLOCK "080904E4"
+    BEGIN
+      VALUE "CompanyName", "Clementine"
+      VALUE "FileDescription", "Clementine music player"
+      VALUE "FileVersion", "0.1"
+      VALUE "InternalName", "clementine"
+      VALUE "LegalCopyright", "David Sansome"
+      VALUE "OriginalFilename", "clementine.exe"
+      VALUE "ProductName", "Clementine"
+      VALUE "ProductVersion", "0.1"
+    END
+  END
+
+  BLOCK "VarFileInfo"
+  BEGIN
+    VALUE "Translation", 0x809, 1252
+  END
+END
diff --git a/src/src.pro b/src/src.pro
index 7a9544e04..6e05c452c 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -123,7 +123,12 @@ FORMS += mainwindow.ui \
 RESOURCES += ../data/data.qrc
 OTHER_FILES += ../data/schema.sql \
     ../data/mainwindow.css
+RC_FILE += ../dist/windres.rc
+
+# Last.fm
 LIBS += -llastfm
+
+# Other platform specific libraries
 !win32:!fedora-win32-cross {
     mac { 
         QMAKE_CXXFLAGS += -I/usr/local/include
@@ -145,6 +150,8 @@ LIBS += -llastfm
 win32|fedora-win32-cross:LIBS += -ltag \
     -lxine \
     -lpthreadGC2
+
+# OSD
 unix:!macx:!fedora-win32-cross:SOURCES += osd_x11.cpp
 macx:SOURCES += osd_mac.cpp
 win32|fedora-win32-cross:SOURCES += osd_win.cpp
@@ -174,8 +181,8 @@ SOURCES += ../3rdparty/qtsingleapplication/qtlockedfile.cpp
 unix:!fedora-win32-cross:SOURCES += ../3rdparty/qtsingleapplication/qtlockedfile_unix.cpp
 win32|fedora-win32-cross:SOURCES += ../3rdparty/qtsingleapplication/qtlockedfile_win.cpp
 
-# Hide the console on windows
 win32|fedora-win32-cross: {
+  # Hide the console on windows
   CONFIG -= console
   CONFIG += windows
   LIBS += -Wl,-subsystem,windows