diff --git a/base-linux/include/linux_dataspace/linux_dataspace.h b/base-linux/include/linux_dataspace/linux_dataspace.h
index 90be967dd..03b975b04 100644
--- a/base-linux/include/linux_dataspace/linux_dataspace.h
+++ b/base-linux/include/linux_dataspace/linux_dataspace.h
@@ -23,7 +23,7 @@ namespace Genode {
 
 	struct Linux_dataspace : Dataspace
 	{
-		enum { FNAME_LEN = 32 };
+		enum { FNAME_LEN = 40 };
 		struct Filename { char buf[FNAME_LEN]; };
 
 		virtual ~Linux_dataspace() { }
diff --git a/base/src/core/include/rom_session_component.h b/base/src/core/include/rom_session_component.h
index cc65c5a53..bd66d5f51 100644
--- a/base/src/core/include/rom_session_component.h
+++ b/base/src/core/include/rom_session_component.h
@@ -26,7 +26,7 @@ namespace Genode {
 		private:
 
 			Rom_module              *_rom_module;
-			char                     _fname[32];
+			char                     _fname[40];
 			Dataspace_component      _ds;
 			Rpc_entrypoint          *_ds_ep;
 			Rom_dataspace_capability _ds_cap;