diff --git a/CMakeLists.txt b/CMakeLists.txt
index 79406c9aa..8229f2aa0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,6 +64,10 @@ IF( ENABLE_JREEN AND NOT LIBJREEN_FOUND )
     MESSAGE(STATUS "Internal libjreen: ${LIBJREEN_INCLUDE_DIR}, ${LIBJREEN_LIBRARY}")
 ENDIF( ENABLE_JREEN AND NOT LIBJREEN_FOUND )
 
+IF( WIN32 )
+  find_library(QTSPARKLE_LIBRARIES qtsparkle)
+ENDIF( WIN32 )
+
 macro_log_feature(JREEN_FOUND "Jreen" "Qt XMPP library" "http://gitorious.org/jreen" FALSE "" "Jreen is needed for the alternative/new Jabber SIP plugin. Built automatically inside Tomahawk, if not installed systemwide and ENABLE_JREEN is true")
 
 macro_optional_find_package(Gloox 1.0)
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 000000000..ac67013ec
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,3 @@
+Version 0.0.1:
+    Features:
+        * Knocks your socks off
diff --git a/admin/win/sparklewin.rss b/admin/win/sparklewin.rss
new file mode 100644
index 000000000..7f2f405e1
--- /dev/null
+++ b/admin/win/sparklewin.rss
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rss version="2.0" xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle"  xmlns:dc="http://purl.org/dc/elements/1.1/">
+    <channel>
+        <title>Tomahawk Player</title>
+        <link>http://www.gettomahawk.com</link>
+        <description>Tomahawk Player</description>
+        <language>en</language>
+        <item>
+            <title>Version 0.0.1 (Tomahawk Player - It Lives!)</title>
+            <sparkle:releaseNotesLink>
+                https://github.com/tomahawk-player/tomahawk/blob/master/ChangeLog
+            </sparkle:releaseNotesLink>
+            <pubDate>Fri, 04 Mar 2011 16:05:15 -0500</pubDate>
+            <enclosure url="http://download.tomahawk-player.org/sparklewin/updates/tomahawk0.1.exe" sparkle:version="0.0.1" />
+        </item>
+    </channel>
+</rss>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 54b36cac8..42aa5f8d3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -154,7 +154,7 @@ IF( APPLE )
     SET( tomahawkSources ${tomahawkSources} mac/tomahawkapp_mac.mm  mac/macshortcuthandler.cpp )
 
     IF(HAVE_SPARKLE)
-    SET( tomahawkHeaders ${tomahawkHeaders} ${SPARKLE}/Headers )
+        SET( tomahawkHeaders ${tomahawkHeaders} ${SPARKLE}/Headers )
     ENDIF(HAVE_SPARKLE)
 
 ENDIF( APPLE )
@@ -206,9 +206,9 @@ ENDIF(GLOOX_FOUND)
 TARGET_LINK_LIBRARIES( tomahawk
     ${LINK_LIBRARIES}
     ${TOMAHAWK_LIBRARIES}
+    ${OS_SPECIFIC_LINK_LIBRARIES}
     ${QT_LIBRARIES}
     ${MAC_EXTRA_LIBS}
-    ${OS_SPECIFIC_LINK_LIBRARIES}
     ${LIBECHONEST_LIBRARY}
     ${QXTWEB_LIBRARIES}
     ${QTWEETLIB_LIBRARIES}
diff --git a/src/CMakeLists.win32.txt b/src/CMakeLists.win32.txt
index 222f0bee5..1557dbfa3 100644
--- a/src/CMakeLists.win32.txt
+++ b/src/CMakeLists.win32.txt
@@ -12,6 +12,8 @@ SET( QXTWEB_LIBRARIES  ${CMAKE_BINARY_DIR}/thirdparty/qxt/qxtweb-standalone/libq
 SET( OS_SPECIFIC_LINK_LIBRARIES
     ${OS_SPECIFIC_LINK_LIBRARIES}
 
+    ${QTSPARKLE_LIBRARIES}
+
 # third party shipped with tomahawk
     ${CMAKE_BINARY_DIR}/thirdparty/rtaudio/librtaudio.dll
 
diff --git a/src/libtomahawk/playlist/dynamic/DynamicModel.cpp b/src/libtomahawk/playlist/dynamic/DynamicModel.cpp
index d4855833c..df2b64225 100644
--- a/src/libtomahawk/playlist/dynamic/DynamicModel.cpp
+++ b/src/libtomahawk/playlist/dynamic/DynamicModel.cpp
@@ -70,8 +70,6 @@ DynamicModel::startOnDemand()
     
     m_onDemandRunning = true;
     m_startOnResolved = false; // not anymore---user clicks a track to start it
-    m_currentAttempts = 0;
-    m_lastResolvedRow = rowCount( QModelIndex() );
 }
 
 void 
diff --git a/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp b/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp
index 2d87d6ba8..00e4cc0a6 100644
--- a/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp
+++ b/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp
@@ -348,7 +348,7 @@ DynamicWidget::controlChanged( const Tomahawk::dyncontrol_ptr& control )
 void 
 DynamicWidget::showPreview()
 {
-    if( m_playlist->mode() == OnDemand && !m_runningOnDemand ) { // if this is a not running station, preview matching tracks
+    if( m_playlist->mode() == OnDemand && !m_runningOnDemand && m_model->rowCount( QModelIndex() ) == 0 ) { // if this is a not running station, preview matching tracks
         generate( 40 ); // ask for more, we'll filter how many we actually want
 }
 }
diff --git a/src/tomahawkwindow.cpp b/src/tomahawkwindow.cpp
index d972bd521..04e64e8d4 100644
--- a/src/tomahawkwindow.cpp
+++ b/src/tomahawkwindow.cpp
@@ -39,6 +39,10 @@
 #include "playlist/dynamic/GeneratorInterface.h"
 #include "scanmanager.h"
 
+#ifdef Q_OS_WIN32
+#include <qtsparkle/Updater>
+#endif
+
 using namespace Tomahawk;
 
 
@@ -128,6 +132,14 @@ TomahawkWindow::TomahawkWindow( QWidget* parent )
       QAction* checkForUpdates = ui->menu_Help->addAction( tr( "Check for updates...") );
       checkForUpdates->setMenuRole( QAction::ApplicationSpecificRole );
       connect(checkForUpdates, SIGNAL( triggered( bool ) ), SLOT( checkForUpdates() ) );
+#elif defined( WIN32 )
+      qtsparkle::Updater* updater = new qtsparkle::Updater( QUrl( "http://download.tomahawk-player.org/sparklewin" ), this );
+      updater->SetNetworkAccessManager( TomahawkUtils::nam() );
+      updater->SetVersion( VERSION );
+      
+      QAction* checkForUpdates = ui->menu_Help->addAction( tr( "Check for updates...") );
+      checkForUpdates->setMenuRole( QAction::ApplicationSpecificRole );
+      connect( checkForUpdates, SIGNAL( triggered() ), updater, SLOT( CheckNow() ) );
 #endif
 
     m_backAvailable = toolbar->addAction( QIcon( RESPATH "images/back.png" ), tr( "Back" ), PlaylistManager::instance(), SLOT( historyBack() ) );