diff --git a/udevd.c b/udevd.c
index c45d3a4cd0..ffa81bbb75 100644
--- a/udevd.c
+++ b/udevd.c
@@ -621,7 +621,7 @@ static struct uevent_msg *get_netlink_msg(void)
 	struct uevent_msg *msg;
 	int bufpos;
 	ssize_t size;
-	static char buffer[UEVENT_BUFFER_SIZE + 512];
+	static char buffer[UEVENT_BUFFER_SIZE+512];
 	char *pos;
 
 	size = recv(uevent_netlink_sock, &buffer, sizeof(buffer), 0);
diff --git a/udevd.h b/udevd.h
index c0a32e97ed..242c0b6907 100644
--- a/udevd.h
+++ b/udevd.h
@@ -38,8 +38,8 @@
 #define UDEVD_MAX_CHILDS_RUNNING	16
 
 /* environment buffer, should match the kernel's size in lib/kobject_uevent.h */
-#define UEVENT_BUFFER_SIZE		1024
-#define UEVENT_NUM_ENVP			32
+#define UEVENT_BUFFER_SIZE		2048
+#define UEVENT_NUM_ENVP			64
 
 enum udevd_msg_type {
 	UDEVD_UNKNOWN,