diff --git a/libmpdvdkit2/libdvdcss.c b/libmpdvdkit2/libdvdcss.c
index 524c098656..6dc28514a7 100644
--- a/libmpdvdkit2/libdvdcss.c
+++ b/libmpdvdkit2/libdvdcss.c
@@ -301,6 +301,10 @@ extern dvdcss_t dvdcss_open ( char *psz_target )
         {
             psz_home = getenv( "HOME" );
         }
+        if( psz_home == NULL )
+        {
+            psz_home = getenv( "USERPROFILE" );
+        }
 
         /* Cache our keys in ${HOME}/.dvdcss/ */
         if( psz_home )
diff --git a/libmpdvdkit2/libdvdcss_changes.diff b/libmpdvdkit2/libdvdcss_changes.diff
index 9b719c395a..3ebb25950a 100644
--- a/libmpdvdkit2/libdvdcss_changes.diff
+++ b/libmpdvdkit2/libdvdcss_changes.diff
@@ -70,3 +70,14 @@
  
  #include "common.h"
  #include "css.h"
+@@ -301,6 +301,10 @@
+         {
+             psz_home = getenv( "HOME" );
+         }
++        if( psz_home == NULL )
++        {
++            psz_home = getenv( "USERPROFILE" );
++        }
+ 
+         /* Cache our keys in ${HOME}/.dvdcss/ */
+         if( psz_home )