diff --git a/ChangeLog b/ChangeLog
index ccf94460a..60d04e211 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-30  Marcus Meissner <marcus@jet.franken.de>
+	
+	* libgphoto2/gphoto2-filesys.c: memset() filesys to 0 so
+	  we do not forget to initialize members. (sf bug #549958)
+
 2002-04-28  Lutz Müller <lutz@users.sourceforge.net>
 
 	* frontends/command-line/main.c: %s/licence/license
diff --git a/libgphoto2/gphoto2-filesys.c b/libgphoto2/gphoto2-filesys.c
index e094530c2..16715b849 100644
--- a/libgphoto2/gphoto2-filesys.c
+++ b/libgphoto2/gphoto2-filesys.c
@@ -438,19 +438,7 @@ gp_filesystem_new (CameraFilesystem **fs)
 
 	CHECK_MEM (*fs = malloc (sizeof (CameraFilesystem)));
 
-        (*fs)->folder = NULL;
-        (*fs)->count = 0;
-
-	(*fs)->set_info_func = NULL;
-	(*fs)->get_info_func = NULL;
-	(*fs)->info_data = NULL;
-
-	(*fs)->file_list_func = NULL;
-	(*fs)->folder_list_func = NULL;
-	(*fs)->list_data = NULL;
-
-	(*fs)->get_file_func = NULL;
-	(*fs)->file_data = NULL;
+	memset(*fs,0,sizeof(CameraFilesystem));
 
 	result = append_folder (*fs, "/", NULL);
 	if (result != GP_OK) {