diff --git a/.gitignore b/.gitignore
index 64f72aee5e..450bbd8639 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,5 +33,7 @@ tests/*.out
 ######################
 __pycache__/
 
-# Customized Makefile overrides
+# Customized Makefile/project overrides
+######################
 GNUmakefile
+user.props
diff --git a/windows/micropython.vcxproj b/windows/micropython.vcxproj
index 62886d1a19..ad93252bad 100644
--- a/windows/micropython.vcxproj
+++ b/windows/micropython.vcxproj
@@ -72,7 +72,9 @@
     <Import Project="msvc/common.props" />
     <Import Project="msvc/release.props" />
   </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Label="UserMacros">
+    <CustomPropsFile Condition="'$(CustomPropsFile)'==''">msvc/user.props</CustomPropsFile>
+  </PropertyGroup>
   <PropertyGroup />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile />
@@ -94,6 +96,7 @@
   </ItemGroup>
   <Import Project="msvc/sources.props" />
   <Import Project="msvc/genhdr.targets" />
+  <Import Project="$(CustomPropsFile)" Condition="exists('$(CustomPropsFile)')" />
   <Target Name="GenHeaders" BeforeTargets="BuildGenerateSources" DependsOnTargets="GenerateHeaders">
   </Target>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />