diff --git a/librpc/idl/wscript_build b/librpc/idl/wscript_build
index b8d11badf43..4dc1199092b 100644
--- a/librpc/idl/wscript_build
+++ b/librpc/idl/wscript_build
@@ -10,7 +10,7 @@ bld.SAMBA_PIDL_LIST('PIDL',
                        dbgidl.idl dnsserver.idl echo.idl frsrpc.idl lsa.idl nbt.idl
                        oxidresolver.idl samr.idl srvsvc.idl winreg.idl dcerpc.idl
                        drsblobs.idl efs.idl frstrans.idl mgmt.idl netlogon.idl
-                       policyagent.idl scerpc.idl svcctl.idl wkssvc.idl''',
+                       policyagent.idl scerpc.idl svcctl.idl wkssvc.idl eventlog6.idl''',
                     options='--header --ndr-parser --samba3-ndr-server --samba3-ndr-client --server --client --python',
                     output_dir='../gen_ndr')
 
diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index f11a5163388..463f01028e0 100755
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -93,7 +93,7 @@ bld.SAMBA_SUBSYSTEM('NDR_WINBIND',
 
 
 bld.SAMBA_LIBRARY('NDR_STANDARD',
-	source='../../librpc/gen_ndr/ndr_echo.c ../../librpc/ndr/ndr_netlogon.c ../../librpc/gen_ndr/ndr_netlogon.c ../../librpc/gen_ndr/ndr_dfs.c ../../librpc/gen_ndr/ndr_atsvc.c ../../librpc/gen_ndr/ndr_wkssvc.c ../../librpc/gen_ndr/ndr_srvsvc.c ../../librpc/ndr/ndr_svcctl.c ../../librpc/gen_ndr/ndr_svcctl.c ../../librpc/gen_ndr/ndr_winreg.c ../../librpc/gen_ndr/ndr_initshutdown.c ../../librpc/gen_ndr/ndr_eventlog.c ../../librpc/gen_ndr/ndr_ntsvcs.c',
+	source='../../librpc/gen_ndr/ndr_echo.c ../../librpc/ndr/ndr_netlogon.c ../../librpc/gen_ndr/ndr_netlogon.c ../../librpc/gen_ndr/ndr_dfs.c ../../librpc/gen_ndr/ndr_atsvc.c ../../librpc/gen_ndr/ndr_wkssvc.c ../../librpc/gen_ndr/ndr_srvsvc.c ../../librpc/ndr/ndr_svcctl.c ../../librpc/gen_ndr/ndr_svcctl.c ../../librpc/gen_ndr/ndr_winreg.c ../../librpc/gen_ndr/ndr_initshutdown.c ../../librpc/gen_ndr/ndr_eventlog.c ../../librpc/gen_ndr/ndr_ntsvcs.c ../../librpc/gen_ndr/ndr_eventlog6.c',
 	vnum='0.0.1',
 	pc_files='../../librpc/ndr_standard.pc',
 	deps='NDR_SECURITY NDR_LSARPC NDR_SAMR',
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index 95d275535c2..69dead77a3b 100644
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -2349,7 +2349,7 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
 	lpcfg_do_global_parameter(lp_ctx, "ntvfs handler", "unixuid default");
 	lpcfg_do_global_parameter(lp_ctx, "max connections", "-1");
 
-	lpcfg_do_global_parameter(lp_ctx, "dcerpc endpoint servers", "epmapper srvsvc wkssvc rpcecho samr netlogon lsarpc spoolss drsuapi winreg dssetup unixinfo browser");
+	lpcfg_do_global_parameter(lp_ctx, "dcerpc endpoint servers", "epmapper srvsvc wkssvc rpcecho samr netlogon lsarpc spoolss drsuapi winreg dssetup unixinfo browser eventlog6");
 	lpcfg_do_global_parameter(lp_ctx, "server services", "smb rpc nbt wrepl ldap cldap kdc drepl winbind ntp_signd kcc dnsupdate");
 	lpcfg_do_global_parameter(lp_ctx, "ntptr providor", "simple_ldb");
 	/* the winbind method for domain controllers is for both RODC
diff --git a/source4/rpc_server/config.mk b/source4/rpc_server/config.mk
index 5ff1bd57226..158c0392238 100644
--- a/source4/rpc_server/config.mk
+++ b/source4/rpc_server/config.mk
@@ -204,6 +204,20 @@ PRIVATE_DEPENDENCIES = \
 
 dcerpc_browser_OBJ_FILES = $(rpc_serversrcdir)/browser/dcesrv_browser.o
 
+################################################
+# Start MODULE dcerpc_eventlog6
+[MODULE::dcerpc_eventlog6]
+INIT_FUNCTION = dcerpc_server_eventlog6_init
+SUBSYSTEM = dcerpc_server
+PRIVATE_DEPENDENCIES = \
+		SAMDB	\
+		DCERPC_COMMON	\
+		NDR_DRSUAPI
+# End MODULE dcerpc_eventlog6
+################################################
+
+dcerpc_browser_OBJ_FILES = $(rpc_serversrcdir)/eventlog/dcesrv_eventlog6.o
+
 ################################################
 # Start SUBSYSTEM dcerpc_server
 [SUBSYSTEM::dcerpc_server]
diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c
index 7bd8dcaa2bd..927766c7933 100644
--- a/source4/rpc_server/dcerpc_server.c
+++ b/source4/rpc_server/dcerpc_server.c
@@ -1400,6 +1400,7 @@ void dcerpc_server_init(struct loadparm_context *lp_ctx)
 	extern NTSTATUS dcerpc_server_remote_init(void);
 	extern NTSTATUS dcerpc_server_lsa_init(void);
 	extern NTSTATUS dcerpc_server_browser_init(void);
+	extern NTSTATUS dcerpc_server_eventlog6_init(void);
 	init_module_fn static_init[] = { STATIC_dcerpc_server_MODULES };
 	init_module_fn *shared_init;
 
diff --git a/source4/rpc_server/wscript_build b/source4/rpc_server/wscript_build
index 5ba7ed6a2ce..f0ce131e7a0 100644
--- a/source4/rpc_server/wscript_build
+++ b/source4/rpc_server/wscript_build
@@ -117,6 +117,12 @@ bld.SAMBA_MODULE('dcerpc_browser',
 	deps='DCERPC_COMMON NDR_BROWSER'
 	)
 
+bld.SAMBA_MODULE('dcerpc_eventlog',
+	source='eventlog/dcesrv_eventlog6.c',
+	subsystem='dcerpc_server',
+	init_function='dcerpc_server_eventlog6_init',
+	deps='DCERPC_COMMON'
+	)
 
 bld.SAMBA_LIBRARY('dcerpc_server',
 	source='dcerpc_server.c dcesrv_auth.c dcesrv_mgmt.c handles.c',