diff --git a/conf/dialplan/default.xml b/conf/dialplan/default.xml
index eb0a1a8f3e..5806ceef63 100644
--- a/conf/dialplan/default.xml
+++ b/conf/dialplan/default.xml
@@ -588,6 +588,14 @@
       </condition>
     </extension>
 
+    <!-- install zrtp_agent.lua into scripts (ZRTP == 9787) -->
+    <extension name="tone_stream">
+      <condition field="destination_number" expression="^9787$">
+	<action application="answer"/>
+	<action application="lua" data="zrtp_agent.lua"/>
+      </condition>
+    </extension>
+
     <!--
 	You will no longer hear the bong tone.  The wav file is playing stating the call is secure.
 	The file will not play unless you have both TLS and SRTP active.
@@ -599,9 +607,10 @@
 	<action application="answer"/>
 	<action application="execute_extension" data="is_secure XML features"/>
 	<action application="playback" data="$${hold_music}"/>
-	<!-- This really should be an IVR for zrtp enrollment but this is just a demo-->
-	<anti-action application="set" data="zrtp_enrollment=true"/>
+	<anti-action application="set" data="zrtp_secure_media=true"/>
 	<anti-action application="answer"/>
+	<anti-action application="playback" data="silence_stream://2000"/>
+	<anti-action application="execute_extension" data="is_zrtp_secure XML features"/>
 	<anti-action application="playback" data="$${hold_music}"/>
       </condition>
     </extension>
diff --git a/conf/dialplan/features.xml b/conf/dialplan/features.xml
index 8a6626e596..11d8031940 100644
--- a/conf/dialplan/features.xml
+++ b/conf/dialplan/features.xml
@@ -37,6 +37,14 @@
       </condition>
     </extension>
 
+    <extension name="is_zrtp_secure">
+      <condition field="${zrtp_secure_media_confirmed}" expression="^true$">
+	<action application="sleep" data="1000"/>
+	<action application="playback" data="misc/call_secured.wav"/>
+	<anti-action application="eval" data="not_secure"/>
+      </condition>
+    </extension>
+
     <extension name="is_secure">
       <!-- Only Truly consider it secure if its TLS and SRTP --> 
       <condition field="${sip_via_protocol}" expression="tls"/>