diff --git a/BFF/BFF.props b/BFF/BFF.props
new file mode 100644
index 0000000..dc5ef74
--- /dev/null
+++ b/BFF/BFF.props
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_PropertySheetDisplayName>Bus Filter Framework</_PropertySheetDisplayName>
+    <!-- By default, look for BFF in parent root directory, otherwise use environment variable value -->
+    <BffRootPath Condition="'$(BffRootPath)' == ''">$(SolutionDir)..\bus-filter-framework</BffRootPath>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(BffRootPath)\bff;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies Condition="'$(DriverType)'=='KMDF'">$(BffRootPath)\$(PlatformName)\$(Configuration)\bff.lib;%(AdditionalDependencies);</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup />
+</Project>
\ No newline at end of file
diff --git a/BFF/README.md b/BFF/README.md
new file mode 100644
index 0000000..7c88dd1
--- /dev/null
+++ b/BFF/README.md
@@ -0,0 +1,15 @@
+# Bus Filter Framework
+
+## Usage
+
+To include and link against [BFF](https://github.com/abysdom/bus-filter-framework) simply add the following snippet to your driver project:
+
+```xml
+  <ImportGroup Label="PropertySheets">
+    <Import Project="BFF.props" />
+  </ImportGroup>
+```
+
+**Important:** if a `PropertySheets` group already exists, append the Import-Node(s) to that to avoid linker issues!
+
+Drop the provided `BFF.props` into the project directory and all include and linker settings will be available. Works for `KMDF` only.
diff --git a/DMF/README.md b/DMF/README.md
index 1d3e6b7..6dc9ee7 100644
--- a/DMF/README.md
+++ b/DMF/README.md
@@ -1,5 +1,7 @@
 # Driver Module Framework (DMF)
 
+**Important:** this has been merged [upstream](https://github.com/Microsoft/DMF/blob/master/Dmf/Documentation/Driver%20Module%20Framework.md#simplifying-compilation-and-linking-with-dmf), yay ❤️
+
 ## Usage
 
 To include and link against [DMF](https://github.com/microsoft/DMF) simply clone DMF to the same project parent directory **or** set the environment variable `DmfRootPath` to the DMF directory. Then add the following snippet to your driver project: