diff --git a/cmake/FlacToOgg.cmake b/cmake/FlacToOgg.cmake
index 7dae2f7..941f9c3 100644
--- a/cmake/FlacToOgg.cmake
+++ b/cmake/FlacToOgg.cmake
@@ -1,6 +1,16 @@
-file(GLOB_RECURSE FLAC_FILES RELATIVE ${DATADIR} ${DATADIR}/*.flac)
-
-foreach(file IN LISTS FLAC_FILES)
-  execute_process(COMMAND oggenc -Q -b 192 --resample 44100 ${file} WORKING_DIRECTORY ${DATADIR})
-  file(REMOVE ${DATADIR}/${file})
-endforeach(file)
+find_program(OGGENC NAMES oggenc NO_CMAKE_FIND_ROOT_PATH)
+if(OGGENC)
+  file(GLOB_RECURSE FLAC_FILES RELATIVE ${DATADIR} ${DATADIR}/*.flac)
+  message(STATUS "FlacToOgg engaging... (using ${OGGENC})")
+  foreach(file IN LISTS FLAC_FILES)
+    message(STATUS ${file})
+    execute_process(COMMAND ${OGGENC} -Q -b 192 --resample 44100 ${file} WORKING_DIRECTORY ${DATADIR}  RESULT_VARIABLE OGGENC_RESULT)
+    if(OGGENC_RESULT)
+      message(WARNING "ERROR: ${OGGENC_RESULT}")
+    else()
+      file(REMOVE ${DATADIR}/${file})
+    endif()
+  endforeach(file)
+else(OGGENC)
+  message(WARNING "FlacToOgg: can't find oggenc!")
+endif(OGGENC)
diff --git a/cmake/libsuperderpy.cmake b/cmake/libsuperderpy.cmake
index 29a0eef..474e510 100644
--- a/cmake/libsuperderpy.cmake
+++ b/cmake/libsuperderpy.cmake
@@ -316,7 +316,7 @@ if (NOT LIBSUPERDERPY_CONFIG_INCLUDED)
 			set(FLACTOOGG_DATADIR "${CMAKE_BINARY_DIR}/android/assets/data")
 			set(FLACTOOGG_DEPEND "")
 		else (EMSCRIPTEN)
-			set(FLACTOOGG_DATADIR "${CMAKE_INSTALL_PREFIX}/${LIBSUPERDERPY_GAMENAME}/data")
+			set(FLACTOOGG_DATADIR "${CMAKE_INSTALL_PREFIX}/share/${LIBSUPERDERPY_GAMENAME}/data")
 			set(FLACTOOGG_DEPEND ${LIBSUPERDERPY_GAMENAME}_install)
 		endif()