diff --git a/Misc/NEWS b/Misc/NEWS
index 0b6a9d580d8..2adff6edb15 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -57,6 +57,8 @@ Library
 Build
 -----
 
+- Issue #1656675: Register a drop handler for .py* files on Windows.
+
 - Issue #4120: Exclude manifest from extension modules in VS2008.
 
 - Issue #4091: Install pythonxy.dll in system32 again.
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index 6b83bfb3af8..847db87bb2e 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -1182,6 +1182,7 @@ def add_registry(db):
     ewi = "Edit with IDLE"
     pat2 = r"Software\Classes\%sPython.%sFile\DefaultIcon"
     pat3 = r"Software\Classes\%sPython.%sFile"
+    pat4 = r"Software\Classes\%sPython.%sFile\shellex\DropHandler"
     tcl_verbs = []
     if have_tcl:
         tcl_verbs=[
@@ -1229,6 +1230,13 @@ def add_registry(db):
               "Python File (no console)", "REGISTRY.def"),
              ("pyc.txt", -1, pat3 % (testprefix, "Compiled"), "",
               "Compiled Python File", "REGISTRY.def"),
+             # Drop Handler
+             ("py.drop", -1, pat4 % (testprefix, ""), "",
+              "{60254CA5-953B-11CF-8C96-00AA00B8708C}", "REGISTRY.def"),
+             ("pyw.drop", -1, pat4 % (testprefix, "NoCon"), "",
+              "{60254CA5-953B-11CF-8C96-00AA00B8708C}", "REGISTRY.def"),
+             ("pyc.drop", -1, pat4 % (testprefix, "Compiled"), "",
+              "{60254CA5-953B-11CF-8C96-00AA00B8708C}", "REGISTRY.def"),
             ])
 
     # Registry keys