UPnP and my Little Camera

A while back, I wrote about some one hacked my baby camera...   Back then, I was puzzled, and thought that it was 'me' who 'forgot' to turn off port forwarding on my router. 

I got a bit of free time on my hands, the Sherlock in me started a little investigation of my past 'mistake'.  Using network sniffers and even wrote a little program to track down a few things.

The problem ==> UPnP

UPnP is a cool protocol that can link devices together, and YES, it can change router's port forward rules. 

So what happened was:

1. My little camera (it is little) boots up

2. The little camera tells my wifi router via UPnP, for all port 80 traffic send to the camera.  (port 80 is the http port)

3. Bad hackers from another country scanned my router and found port 80 is a little camera.

4. The camera does have a security flaw... 

5. Hack it!

I don't even know how to fix this, (other than turn off UPnP, turn my $100 camera off) ... I wish there is a way i can tell the camera to stop that, just as me telling my 3 year old. (which she never listen anyway)

Need to work on something to fix this ...  ??