diff --git a/docs/drinks.md b/docs/drinks.md
new file mode 100644
index 0000000000000000000000000000000000000000..a30a34e81dbe46c0f012ab046aec7e41f912cfe2
--- /dev/null
+++ b/docs/drinks.md
@@ -0,0 +1,80 @@
+# Bars
+
+We run several bars and a crate sale to supply you with drinks around the clock.
+
+!!! danger "Attention"
+ Payment is **in cash only**. Local ATMs will probably be overwhelmed. **Bring enough money!**
+
+## Marktplatz Bar
+
+**Location**: [Marktplatz](https://map.events.ccc.de/camp/2023/map/#19.68/53.0316514/13.3052766){target=_blank}<br>
+**Sells**: Mate, Water, Beer, Lemonades, Tschunk<br>
+**Price List:** tbd
+
+**Opening Hours**
+
+| Day | Opens | Closes |
+| ---------- | ------ | ------ |
+| 0 (14.08.) | tbd | tbd |
+| 1 (15.08.) | tbd | tbd |
+| 2 (16.08.) | tbd | tbd |
+| 3 (17.08.) | tbd | tbd |
+| 4 (18.08.) | tbd | tbd |
+| 5 (19.08.) | tbd | tbd |
+
+---
+
+## UFO Bar
+
+**Location:** [UFO](https://map.events.ccc.de/camp/2023/map/#20.03/53.0310435/13.3088454){target=_blank}<br>
+**Sells:** Mate, Water, Beer, Lemonades<br>
+**Price List:** tbd
+
+**Opening Hours**
+
+| Day | Opens | Closes |
+| ---------- | ------ | ------ |
+| 0 (14.08.) | tbd | tbd |
+| 1 (15.08.) | tbd | tbd |
+| 2 (16.08.) | tbd | tbd |
+| 3 (17.08.) | tbd | tbd |
+| 4 (18.08.) | tbd | tbd |
+| 5 (19.08.) | tbd | tbd |
+
+---
+
+## Chillout Bar
+
+**Location: [Chillout Space](https://map.events.ccc.de/camp/2023/map/#20.17/53.0335829/13.3052935){target=_blank}<br>
+**Sells:** Mate, Water, Beer, Lemonades<br>
+**Price List:** tbd
+
+**Opening Hours**
+
+| Day | Opens | Closes |
+| ---------- | ------ | ------ |
+| 0 (14.08.) | tbd | tbd |
+| 1 (15.08.) | tbd | tbd |
+| 2 (16.08.) | tbd | tbd |
+| 3 (17.08.) | tbd | tbd |
+| 4 (18.08.) | tbd | tbd |
+| 5 (19.08.) | tbd | tbd |
+
+---
+
+## Crate Sale and Crate Presale Pickup
+
+Location: [Bar Team Logistics Area](https://map.events.ccc.de/camp/2023/map/#20.68/53.0299015/13.3055234){target=_blank}<br>
+Sells: Water, Mate, Beer, Lemonades, Ice<br>
+Price List: tbd
+
+**Opening Hours**
+
+| Day | Opens | Closes |
+| ---------- | ------ | ------ |
+| 0 (14.08.) | tbd | tbd |
+| 1 (15.08.) | tbd | tbd |
+| 2 (16.08.) | tbd | tbd |
+| 3 (17.08.) | tbd | tbd |
+| 4 (18.08.) | tbd | tbd |
+| 5 (19.08.) | tbd | tbd |
diff --git a/docs/facilities.md b/docs/facilities.md
index efc0e3d6d08a4dae6a24f892dacb7e96f58a1db6..191f2e2c488ea021a90f95787824be2db7a7cba4 100644
--- a/docs/facilities.md
+++ b/docs/facilities.md
@@ -56,7 +56,7 @@ supports them in handling the situation.
## Bars
-Fullfill all your cold drink needs.
+See [Bars](drinks.md#bars) and [Crate Sale](drinks.md#crate-sale-and-crate-presale-pickup)
## Lost and Found
diff --git a/docs/faq.md b/docs/faq.md
index 4575638e372ec7358a70545a99faec341b666026..fbcf0dfe3ab30e373b726ccb275cafcbef070fbd 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -136,7 +136,7 @@ Yes. In the current network-planning each Datenklo will have 100BASE-TX/1000BASE
## Water
### How will drinking water be distributed?
-There will be water supply stations where you can get water from a tap. You can fill your water bottle at the water supply but you can't hook up a hose.
+There will be water supply stations where you can get water from a tap. You can fill your water bottle at the water supply but you can't hook up a hose. You can also buy bottled water at the [Bars](drinks.md)
### Will there be a hookup for campers?
No, there will be no option to hook up water or waste water for a camper.
@@ -148,7 +148,7 @@ It's complicated - get in touch!
### How to get Food during the camp?
There will be several independent food stalls offering hot meals - from French fries to curry, breakfast foods, cake and much more.
For people volunteering there will again be food at the Heaven kitchen.
-You can get snacks at the [späti](facilities#spaeti) and cold drinks at all [bars](facilities#boc)
+You can get snacks at the [späti](facilities#spaeti) and cold drinks at all [bars](drinks.md) and at the [Crate Sale](drinks.md#crate-sale-and-crate-presale-pickup)
See [Food](food.md) for detail and more options.
diff --git a/docs/food.md b/docs/food.md
index 7f4cf347f9cf139379e05b6fa79a5c7a7b749b3b..afe5c559ae0128894a32b143bc88675e8ebfe6eb 100644
--- a/docs/food.md
+++ b/docs/food.md
@@ -1,6 +1,4 @@
-# Food and drinks
-
-## Bars
+# Food
## Farmers market
diff --git a/docs/location.md b/docs/location.md
index 5330e8c47bacfabe0cc4cf3a52d2643eaee6d916..fc10100e5e70621ebde7cea9f66a713621ebf61c 100644
--- a/docs/location.md
+++ b/docs/location.md
@@ -9,7 +9,7 @@ The Chaos Communication Camp takes place at the
([Ziegeleipark](https://www.ziegeleipark.de/), [OpenStreetMap](https://www.openstreetmap.org/#map=17/53.03131/13.30736), [Google Maps](https://www.google.com/maps/place/Ziegeleipark+Mildenberg/@53.031938,13.306962,1331m/?hl=en))
-We will organize the basic infrastructure like power, internet, a bar, several food stalls, and beautiful illumination. Everything else is in your hands - so bring your camping gear, gadgets, Go boards, webapps, p2p-simulators, knitted hardware protectors, drones, lockpicking sets and whatever else you need for some days in the big room with the blue ceiling. Respect Ziegelei property and equipment, remember we may want to come back here next time.
+We will organize the basic infrastructure like power, internet, bars, several food stalls, and beautiful illumination. Everything else is in your hands - so bring your camping gear, gadgets, Go boards, webapps, p2p-simulators, knitted hardware protectors, drones, lockpicking sets and whatever else you need for some days in the big room with the blue ceiling. Respect Ziegelei property and equipment, remember we may want to come back here next time.
The nearby town [Zehdenick](http://www.zehdenick.de/) provides infrastructure like several ATM, Gas Stations, supermarkets and a rather big Hardware Store (read: Hardware as in wood, nails and camping equipment, not as in motherboard).
diff --git a/mkdocs.yml b/mkdocs.yml
index eeec0a418005f6d3365f63f47a2417e8cc112cc4..ccea98dab2b80fd6b42dc4e5179a063d2b073965 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -27,7 +27,12 @@ theme:
#navigation_depth: 2
#nav_style: primary
-nav:
+
+markdown_extensions:
+ - extra
+ - admonition
+
+nav:
- index.md
- location.md
- timeline.md
@@ -36,6 +41,7 @@ nav:
- parcel.md
- facilities.md
- food.md
+ - drinks.md
- caravans.md
- participate.md
- camping-villages.md