diff --git a/atom.xml b/atom.xml
index 5dbce56375..999fd51ee2 100644
--- a/atom.xml
+++ b/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Home Assistant]]></title>
   <link href="https://home-assistant.io/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-03-03T17:36:50+00:00</updated>
+  <updated>2017-03-04T03:41:20+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
@@ -220,6 +220,12 @@
   <li>Fix discovery taking up all memory and cpu (<a href="https://github.com/balloob">@balloob</a> + <a href="https://github.com/tomusher">@tomusher</a>)</li>
 </ul>
 
+<h3><a class="title-link" name="release-0393---march-4" href="#release-0393---march-4"></a> Release 0.39.3 - March 4</h3>
+
+<ul>
+  <li>Prevent discovered services and devices to be handled twice (@colinodell)</li>
+</ul>
+
 <h4>Breaking changes</h4>
 
 <ul>
diff --git a/blog/2017/02/25/config-panel-and-state-restoration/index.html b/blog/2017/02/25/config-panel-and-state-restoration/index.html
index dc57cd0186..3b54aa57cb 100644
--- a/blog/2017/02/25/config-panel-and-state-restoration/index.html
+++ b/blog/2017/02/25/config-panel-and-state-restoration/index.html
@@ -311,6 +311,12 @@
   <li>Fix discovery taking up all memory and cpu (<a href="https://github.com/balloob">@balloob</a> + <a href="https://github.com/tomusher">@tomusher</a>)</li>
 </ul>
 
+<h3><a class="title-link" name="release-0393---march-4" href="#release-0393---march-4"></a> Release 0.39.3 - March 4</h3>
+
+<ul>
+  <li>Prevent discovered services and devices to be handled twice (@colinodell)</li>
+</ul>
+
 <h4>Breaking changes</h4>
 
 <ul>
diff --git a/blog/categories/community/atom.xml b/blog/categories/community/atom.xml
index 881fd5f61f..d893e37cc3 100644
--- a/blog/categories/community/atom.xml
+++ b/blog/categories/community/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Community | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/community/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-03-03T17:36:50+00:00</updated>
+  <updated>2017-03-04T03:41:20+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/device-tracking/atom.xml b/blog/categories/device-tracking/atom.xml
index 83836a8ac6..d913a9cda0 100644
--- a/blog/categories/device-tracking/atom.xml
+++ b/blog/categories/device-tracking/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Device-Tracking | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/device-tracking/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-03-03T17:36:50+00:00</updated>
+  <updated>2017-03-04T03:41:20+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/esp8266/atom.xml b/blog/categories/esp8266/atom.xml
index fc158eaf64..ee60ff9a95 100644
--- a/blog/categories/esp8266/atom.xml
+++ b/blog/categories/esp8266/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: ESP8266 | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/esp8266/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-03-03T17:36:50+00:00</updated>
+  <updated>2017-03-04T03:41:20+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/how-to/atom.xml b/blog/categories/how-to/atom.xml
index 81e70d4be1..5055a7d7eb 100644
--- a/blog/categories/how-to/atom.xml
+++ b/blog/categories/how-to/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: How-To | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/how-to/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-03-03T17:36:50+00:00</updated>
+  <updated>2017-03-04T03:41:20+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/ibeacons/atom.xml b/blog/categories/ibeacons/atom.xml
index 185512022a..f5bea17cf0 100644
--- a/blog/categories/ibeacons/atom.xml
+++ b/blog/categories/ibeacons/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: iBeacons | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/ibeacons/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-03-03T17:36:50+00:00</updated>
+  <updated>2017-03-04T03:41:20+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/internet-of-things/atom.xml b/blog/categories/internet-of-things/atom.xml
index 2460745aff..e4ca93f3ab 100644
--- a/blog/categories/internet-of-things/atom.xml
+++ b/blog/categories/internet-of-things/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Internet-of-Things | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/internet-of-things/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-03-03T17:36:50+00:00</updated>
+  <updated>2017-03-04T03:41:20+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/iot-data/atom.xml b/blog/categories/iot-data/atom.xml
index 726f97553e..75e633ef58 100644
--- a/blog/categories/iot-data/atom.xml
+++ b/blog/categories/iot-data/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: IoT-Data | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/iot-data/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-03-03T17:36:50+00:00</updated>
+  <updated>2017-03-04T03:41:20+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/merchandise/atom.xml b/blog/categories/merchandise/atom.xml
index a813cfb26a..901f2effd3 100644
--- a/blog/categories/merchandise/atom.xml
+++ b/blog/categories/merchandise/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Merchandise | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/merchandise/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-03-03T17:36:50+00:00</updated>
+  <updated>2017-03-04T03:41:20+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/micropython/atom.xml b/blog/categories/micropython/atom.xml
index 3ef961a138..0875ad26d3 100644
--- a/blog/categories/micropython/atom.xml
+++ b/blog/categories/micropython/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Micropython | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/micropython/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-03-03T17:36:50+00:00</updated>
+  <updated>2017-03-04T03:41:20+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/mqtt/atom.xml b/blog/categories/mqtt/atom.xml
index 149f6fcd84..a100ad3627 100644
--- a/blog/categories/mqtt/atom.xml
+++ b/blog/categories/mqtt/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: MQTT | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/mqtt/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-03-03T17:36:50+00:00</updated>
+  <updated>2017-03-04T03:41:20+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/organisation/atom.xml b/blog/categories/organisation/atom.xml
index b00e5cb338..16a2ee28e5 100644
--- a/blog/categories/organisation/atom.xml
+++ b/blog/categories/organisation/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Organisation | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/organisation/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-03-03T17:36:50+00:00</updated>
+  <updated>2017-03-04T03:41:20+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/owntracks/atom.xml b/blog/categories/owntracks/atom.xml
index 4ca2faad92..ef8e9a1ac7 100644
--- a/blog/categories/owntracks/atom.xml
+++ b/blog/categories/owntracks/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: OwnTracks | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/owntracks/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-03-03T17:36:50+00:00</updated>
+  <updated>2017-03-04T03:41:20+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/presence-detection/atom.xml b/blog/categories/presence-detection/atom.xml
index 7feab69cdc..728680f934 100644
--- a/blog/categories/presence-detection/atom.xml
+++ b/blog/categories/presence-detection/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Presence-Detection | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/presence-detection/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-03-03T17:36:50+00:00</updated>
+  <updated>2017-03-04T03:41:20+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/public-service-announcement/atom.xml b/blog/categories/public-service-announcement/atom.xml
index daad019843..0c76a1d81c 100644
--- a/blog/categories/public-service-announcement/atom.xml
+++ b/blog/categories/public-service-announcement/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Public-Service-Announcement | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/public-service-announcement/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-03-03T17:36:50+00:00</updated>
+  <updated>2017-03-04T03:41:20+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/release-notes/atom.xml b/blog/categories/release-notes/atom.xml
index 28076f71ce..a6e17e04ef 100644
--- a/blog/categories/release-notes/atom.xml
+++ b/blog/categories/release-notes/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Release-Notes | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/release-notes/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-03-03T17:36:50+00:00</updated>
+  <updated>2017-03-04T03:41:20+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
@@ -210,6 +210,10 @@ And a final shout out to [Pascal][@pvizeli]. He keeps improving the performance
  - Move Zigbee from eventbus to dispatcher ([@pvizeli])
  - Fix discovery taking up all memory and cpu ([@balloob] + [@tomusher])
 
+### <a class='title-link' name='release-0393---march-4' href='#release-0393---march-4'></a> Release 0.39.3 - March 4 
+
+ - Prevent discovered services and devices to be handled twice (@colinodell)
+
 #### Breaking changes
 
  - VolvoOnCall has been extended with more features and had to be converted to a component
diff --git a/blog/categories/survey/atom.xml b/blog/categories/survey/atom.xml
index 369e788b0c..53926d1baa 100644
--- a/blog/categories/survey/atom.xml
+++ b/blog/categories/survey/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Survey | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/survey/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-03-03T17:36:50+00:00</updated>
+  <updated>2017-03-04T03:41:20+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/talks/atom.xml b/blog/categories/talks/atom.xml
index 8313183180..c3116d8f59 100644
--- a/blog/categories/talks/atom.xml
+++ b/blog/categories/talks/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Talks | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/talks/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-03-03T17:36:50+00:00</updated>
+  <updated>2017-03-04T03:41:20+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/technology/atom.xml b/blog/categories/technology/atom.xml
index b1c8482693..7a1a48bbab 100644
--- a/blog/categories/technology/atom.xml
+++ b/blog/categories/technology/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Technology | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/technology/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-03-03T17:36:50+00:00</updated>
+  <updated>2017-03-04T03:41:20+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/user-stories/atom.xml b/blog/categories/user-stories/atom.xml
index c8032d99e4..724acec976 100644
--- a/blog/categories/user-stories/atom.xml
+++ b/blog/categories/user-stories/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: User-Stories | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/user-stories/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-03-03T17:36:50+00:00</updated>
+  <updated>2017-03-04T03:41:20+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/video/atom.xml b/blog/categories/video/atom.xml
index c8d904db5c..5c2f9b42a7 100644
--- a/blog/categories/video/atom.xml
+++ b/blog/categories/video/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Video | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/video/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-03-03T17:36:50+00:00</updated>
+  <updated>2017-03-04T03:41:20+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/website/atom.xml b/blog/categories/website/atom.xml
index 0b3227ef9b..4982570d2e 100644
--- a/blog/categories/website/atom.xml
+++ b/blog/categories/website/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Website | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/website/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-03-03T17:36:50+00:00</updated>
+  <updated>2017-03-04T03:41:20+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/index.html b/index.html
index 3f51ff8abb..46ec2c3791 100644
--- a/index.html
+++ b/index.html
@@ -115,11 +115,11 @@ Home Assistant is an open-source home automation platform running on Python 3. T
   <div class="grid">
     <div class="grid__item one-third lap-one-third palm-one-whole">
       <div class='current-version material-card text'>
-        <h1>Current Version: 0.39.2</h1>
-        Released: <span class='release-date'>March 01, 2017</span>
+        <h1>Current Version: 0.39.3</h1>
+        Released: <span class='release-date'>March 04, 2017</span>
 
         <div class='links'>
-          <a href='/blog/2017/02/25/config-panel-and-state-restoration/#release-0392---march-1'>Release notes</a>
+          <a href='/blog/2017/02/25/config-panel-and-state-restoration/#release-0393---march-4'>Release notes</a>
         </div>
       </div>
       <div class='join-community material-card text'>
diff --git a/sitemap.xml b/sitemap.xml
index 098f086ce6..1177689ed9 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -2954,62 +2954,62 @@
 </url>
 <url>
 <loc>https://home-assistant.io/demo/frontend.html</loc>
-<lastmod>2017-03-03T17:36:03+00:00</lastmod>
+<lastmod>2017-03-04T03:40:37+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/index.html</loc>
-<lastmod>2017-03-03T17:36:03+00:00</lastmod>
+<lastmod>2017-03-04T03:40:37+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-event.html</loc>
-<lastmod>2017-03-03T17:36:03+00:00</lastmod>
+<lastmod>2017-03-04T03:40:37+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-info.html</loc>
-<lastmod>2017-03-03T17:36:03+00:00</lastmod>
+<lastmod>2017-03-04T03:40:37+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-service.html</loc>
-<lastmod>2017-03-03T17:36:03+00:00</lastmod>
+<lastmod>2017-03-04T03:40:37+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-state.html</loc>
-<lastmod>2017-03-03T17:36:03+00:00</lastmod>
+<lastmod>2017-03-04T03:40:37+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-template.html</loc>
-<lastmod>2017-03-03T17:36:03+00:00</lastmod>
+<lastmod>2017-03-04T03:40:37+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-history.html</loc>
-<lastmod>2017-03-03T17:36:03+00:00</lastmod>
+<lastmod>2017-03-04T03:40:37+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-iframe.html</loc>
-<lastmod>2017-03-03T17:36:03+00:00</lastmod>
+<lastmod>2017-03-04T03:40:37+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-logbook.html</loc>
-<lastmod>2017-03-03T17:36:03+00:00</lastmod>
+<lastmod>2017-03-04T03:40:37+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-map.html</loc>
-<lastmod>2017-03-03T17:36:03+00:00</lastmod>
+<lastmod>2017-03-04T03:40:37+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/googlef4f3693c209fe788.html</loc>
-<lastmod>2017-03-03T17:36:03+00:00</lastmod>
+<lastmod>2017-03-04T03:40:37+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/fonts/roboto/DESCRIPTION.en_us.html</loc>
-<lastmod>2017-03-03T17:36:03+00:00</lastmod>
+<lastmod>2017-03-04T03:40:37+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/fonts/robotomono/DESCRIPTION.en_us.html</loc>
-<lastmod>2017-03-03T17:36:03+00:00</lastmod>
+<lastmod>2017-03-04T03:40:37+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/mdi-demo.html</loc>
-<lastmod>2017-03-03T17:36:03+00:00</lastmod>
+<lastmod>2017-03-04T03:40:37+00:00</lastmod>
 </url>
 </urlset>
diff --git a/version.json b/version.json
index e6f16625cf..4538e2cc4e 100644
--- a/version.json
+++ b/version.json
@@ -1,15 +1,15 @@
 {
-  "current_version": "0.39.2",
-  "release_date": "2017-03-01T00:00:00+00:00",
+  "current_version": "0.39.3",
+  "release_date": "2017-03-04T00:00:00+00:00",
   "release_notes": "https://home-assistant.io/blog/2017/02/25/config-panel-and-state-restoration/",
   "release_notes_path": "/blog/2017/02/25/config-panel-and-state-restoration/",
   "release_title": "0.39: Configuration panel, state restoration and improved docs",
   "release_description": "0.39 is by far our best release yet.",
-  "patch_version_notes": "#release-0392---march-1",
+  "patch_version_notes": "#release-0393---march-4",
   "root_url": "https://home-assistant.io",
   "semantic_version": {
     "major": 0,
     "minor": 39,
-    "patch": 2
+    "patch": 3
   }
 }