How to connect WRT54G to WAP54G in WDS mode

ADSL-------WRT54G>----------<WAP54G----------PC.
Where WRT54G is in WDS Client mode and WAP54G is in Bridge Mode. I have 2 WAP54G Connected with Bridge/WDS to WRT54G and it is working fine. Also the WRT54G serves as WIFI access point, wich is also working fine.

Now i want to setup new site
ADSL -----WAP54G>............<WRT54G>------(Multi-PC)
I Want to connect WRT54G to WAP54G So i can use the WRT54G on the remote location as an WiFi access point and as Wired Access. I got the connection the other way arround (WRT54G as access and WAP54G on remote location, See above)
Now i want to setup different site with WAP54G on Home Network and WRT54G on remote location, i got a connection working, but it uses the DHCP of the ADSL Router of the home site, in stead of the DHCP of the WRT54G.
Can anyone tell me how to setup WRT54G to connect to WAP54G in Bridge/WDS mode