diff --git a/daemon/call.c b/daemon/call.c
index 13c44562d..7f003bc0b 100644
--- a/daemon/call.c
+++ b/daemon/call.c
@@ -564,14 +564,17 @@ fail:
 
 static int setup_peer(struct peer *p, struct stream *s, const char *tag) {
 	struct streamrelay *a, *b;
+	struct callstream *cs;
 
+	cs = p->up;
 	a = &p->rtps[0];
 	b = &p->rtps[1];
 
 	if (a->peer.ip != s->ip || a->peer.port != b->peer.port) {
-		p->confirmed = 0;
-		if (p->kernelized)
-			unkernelize(p);
+		cs->peers[0].confirmed = 0;
+		unkernelize(&cs->peers[0]);
+		cs->peers[1].confirmed = 0;
+		unkernelize(&cs->peers[1]);
 	}
 
 	a->peer.ip = b->peer.ip = s->ip;
@@ -600,8 +603,10 @@ static void steal_peer(struct peer *p, struct streamrelay *r) {
 
 	mylog(LOG_DEBUG, "[%s] Re-using existing open RTP ports", c->callid);
 
-	if (s->kernelized)
-		unkernelize(s);
+	p->confirmed = 0;
+	unkernelize(p);
+	s->confirmed = 0;
+	unkernelize(s);
 
 	p->filled = 1;
 	strmove(&p->mediatype, &s->mediatype);
diff --git a/debian/changelog b/debian/changelog
index b06d02fe7..d101518f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ngcp-mediaproxy-ng (1.3.4) unstable; urgency=low
+
+  * Make the daemon more aggressive with invalidating peer information
+
+ -- Richard Fuchs <rfuchs@sipwise.com>  Thu, 05 May 2011 16:08:31 -0400
+
 ngcp-mediaproxy-ng (1.3.3) unstable; urgency=low
 
   * Add --advertised-ip to defaults file.