diff --git a/builders/windows-builder.py b/builders/windows-builder.py
index 02ccdf5..19f94c0 100644
--- a/builders/windows-builder.py
+++ b/builders/windows-builder.py
@@ -102,7 +102,7 @@ from distutils import dir_util
 from hashlib import md5
 from shutil import copy, move, rmtree
 
-from lxml.etree import fromstring, tostring
+from lxml.etree import fromstring, parse, tostring
 from lxml.builder import E, ElementMaker
 
 from builder import Builder
@@ -173,6 +173,10 @@ class WindowsBuilder(Builder):
                     component.append(FxE.FirewallException(Id='OpenLP_UDP', Name='OpenLP',
                                                            Description=description, IgnoreFailure='yes',
                                                            Program=program, Protocol='udp', Scope='any'))
+                    # Add the file association XML
+                    with open(os.path.join(self.config_dir, 'file_associations.xml')) as assoc_file:
+                        file_assoc = parse(assoc_file)
+                        component.append(file_assoc.getroot())
                 element.append(component)
                 components.append(component)
 
diff --git a/windows/file-associations.xml b/windows/file-associations.xml
new file mode 100644
index 0000000..40cf8fc
--- /dev/null
+++ b/windows/file-associations.xml
@@ -0,0 +1,10 @@
+<ProgId Id="OpenLP.Service" Description="OpenLP Service File" Icon="[APPLICATIONFOLDER]service-file.ico" Advertise="yes">
+    <Extension Id="osz">
+        <Verb Id="Open" Command="Open" Argument="&quot;%1&quot;" />
+        <MIME Advertise="yes" ContentType="application/-x-openlp-service" Default="yes" />
+    </Extension>
+    <Extension Id="oszl">
+        <Verb Id="Open" Command="Open" Argument="&quot;%1&quot;" />
+        <MIME Advertise="yes" ContentType="application/-x-openlp-service-lite" Default="yes" />
+    </Extension>
+</ProgId>
diff --git a/windows/service-file.ico b/windows/service-file.ico
new file mode 100644
index 0000000..2a8ca52
Binary files /dev/null and b/windows/service-file.ico differ