diff --git a/spring-security-digest-auth/src/main/resources/webSecurityConfig.xml b/spring-security-digest-auth/src/main/resources/webSecurityConfig.xml
index 2b55ca1c73..ae554a8b69 100644
--- a/spring-security-digest-auth/src/main/resources/webSecurityConfig.xml
+++ b/spring-security-digest-auth/src/main/resources/webSecurityConfig.xml
@@ -7,16 +7,27 @@
 
 	<http pattern="/securityNone" security="none" />
 
-	<http use-expressions="true">
+	<http use-expressions="true" entry-point-ref="digestEntryPoint">
 		<intercept-url pattern="/**" access="isAuthenticated()" />
 
-        <http-basic entry-point-ref="myBasicAuthenticationEntryPoint" />
-
+		<custom-filter ref="digestFilter" after="BASIC_AUTH_FILTER" />
 	</http>
 
+	<beans:bean id="digestFilter"
+		class="org.springframework.security.web.authentication.www.DigestAuthenticationFilter">
+		<beans:property name="userDetailsService" ref="userService" />
+		<beans:property name="authenticationEntryPoint" ref="digestEntryPoint" />
+	</beans:bean>
+	<beans:bean id="digestEntryPoint"
+		class="org.springframework.security.web.authentication.www.DigestAuthenticationEntryPoint">
+		<beans:property name="realmName"
+			value="Contacts Realm via Digest Authentication" />
+		<beans:property name="key" value="acegi" />
+	</beans:bean>
+
 	<authentication-manager>
 		<authentication-provider>
-			<user-service>
+			<user-service id="userService">
 				<user name="user1" password="user1Pass" authorities="ROLE_USER" />
 			</user-service>
 		</authentication-provider>