diff --git a/recipe/bld.bat b/recipe/bld.bat
index 14fa6b5..23cf565 100644
--- a/recipe/bld.bat
+++ b/recipe/bld.bat
@@ -1,9 +1,10 @@
 if not exist %PREFIX% mkdir %PREFIX%
 
 move lib\x64\* %LIBRARY_LIB%
-move include\* %LIBRARY_INC%
+if not exist %LIBRARY_INC%\CL mkdir %LIBRARY_INC%\CL
+move include\CL\* %LIBRARY_INC%\CL
 
- not exist %LIBRARY_PREFIX%\etc mkdir %LIBRARY_PREFIX%\etc
- not exist %LIBRARY_PREFIX%\etc\OpenCL mkdir %LIBRARY_PREFIX%\etc\OpenCL
- not exist %LIBRARY_PREFIX%\etc\OpenCL\vendors mkdir %LIBRARY_PREFIX%\etc\OpenCL\vendors
- type nul >> %LIBRARY_PREFIX%\etc\OpenCL\vendors\cuda.icd
+if not exist %LIBRARY_PREFIX%\etc mkdir %LIBRARY_PREFIX%\etc
+if not exist %LIBRARY_PREFIX%\etc\OpenCL mkdir %LIBRARY_PREFIX%\etc\OpenCL
+if not exist %LIBRARY_PREFIX%\etc\OpenCL\vendors mkdir %LIBRARY_PREFIX%\etc\OpenCL\vendors
+type nul >> %LIBRARY_PREFIX%\etc\OpenCL\vendors\cuda.icd
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index 82b429a..993edac 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -20,7 +20,7 @@ source:
 
 build:
   number: 0
-  skip: true  # [osx or aarch64 or ppc64le]
+  skip: true  # [osx or (linux and (s390x or aarch64 or ppc64le))]
 
 test:
   commands: