9 files changed, 79 insertions, 4 deletions
diff --git a/2025/draft-schedule.md b/2025/draft-schedule.md
index a0cf2b1a..052ddf9f 100644
--- a/2025/draft-schedule.md
+++ b/2025/draft-schedule.md
@@ -14,6 +14,7 @@ Jump to: <a href="#date-2025-12-06">Sat Dec 6</a> - <a href="#date-2025-12-07">S
 [[!template id=sched time="""20""" q-and-a="""<a href="https://pad.emacsconf.org/2025-swanky">Etherpad</a>""" startutc="""2025-12-06T15:40:00+0000""" endutc="""2025-12-06T16:00:00+0000""" start="""10:40""" end="""11:00""" title="""Swanky Python: Interactive development for Python""" url="""/2025/talks/swanky""" speakers="""Scott Zimmermann""" track="""Development""" watch="""https://emacsconf.org/2025/watch/dev""" slug="""swanky""" note=""""""]]
 [[!template id=sched time="""20""" q-and-a="""<a href="https://media.emacsconf.org/2025/current/bbb-latex.html">BBB</a>""" startutc="""2025-12-06T16:10:00+0000""" endutc="""2025-12-06T16:30:00+0000""" start="""11:10""" end="""11:30""" title="""LaTeX export in org-mode: the overhaul""" url="""/2025/talks/latex""" speakers="""Pedro A. Aranda Gutiérrez""" track="""General""" watch="""https://emacsconf.org/2025/watch/gen""" slug="""latex""" note=""""""]]
 [[!template id=sched time="""20""" q-and-a="""<a href="https://chat.emacsconf.org/?join=emacsconf">#emacsconf, speaker nick: kanakana</a>""" startutc="""2025-12-06T16:10:00+0000""" endutc="""2025-12-06T16:30:00+0000""" start="""11:10""" end="""11:30""" title="""Juicemacs: Exploring Speculative JIT Compilation for ELisp in Java""" url="""/2025/talks/juicemacs""" speakers="""Kana""" track="""Development""" watch="""https://emacsconf.org/2025/watch/dev""" slug="""juicemacs""" note=""""""]]
+[[!template id=sched time="""10""" q-and-a="""<a href="https://media.emacsconf.org/2025/current/bbb-languages.html">BBB</a>""" startutc="""2025-12-06T18:00:00+0000""" endutc="""2025-12-06T18:10:00+0000""" start="""1:00""" end="""1:10""" title="""Studying foreign languages with Emacs, Org Mode and gptel""" url="""/2025/talks/languages""" speakers="""Marek""" track="""General""" watch="""https://emacsconf.org/2025/watch/gen""" slug="""languages""" note=""""""]]
 [[!template id=sched time="""20""" q-and-a="""<a href="https://media.emacsconf.org/2025/current/bbb-llm.html">BBB</a>""" startutc="""2025-12-06T18:00:00+0000""" endutc="""2025-12-06T18:20:00+0000""" start="""1:00""" end="""1:20""" title="""Emacs, editors, and LLM driven workflows""" url="""/2025/talks/llm""" speakers="""Andrew Hyatt""" track="""Development""" watch="""https://emacsconf.org/2025/watch/gen""" slug="""llm""" note=""""""]]
 [[!template id=sched time="""20""" q-and-a="""none""" startutc="""2025-12-06T18:30:00+0000""" endutc="""2025-12-06T18:50:00+0000""" start="""1:30""" end="""1:50""" title="""corfu+yasnippet: Easier than I thought""" url="""/2025/talks/completion""" speakers="""Pedro A. Aranda Gutiérrez""" track="""General""" watch="""https://emacsconf.org/2025/watch/gen""" slug="""completion""" note=""""""]]
 [[!template id=sched time="""20""" q-and-a="""none""" startutc="""2025-12-06T18:40:00+0000""" endutc="""2025-12-06T19:00:00+0000""" start="""1:40""" end="""2:00""" title="""emacs-claude-code: Intelligent Claude Integration for Emacs""" url="""/2025/talks/claude-code""" speakers="""Yusuke Watanabe""" track="""Development""" watch="""https://emacsconf.org/2025/watch/dev""" slug="""claude-code""" note=""""""]]
diff --git a/2025/info/gnus-after.md b/2025/info/gnus-after.md
new file mode 100644
index 00000000..dc986e78
--- /dev/null
+++ b/2025/info/gnus-after.md
@@ -0,0 +1,10 @@
+<!-- Automatically generated by emacsconf-publish-after-page -->
+
+
+Questions or comments? Please e-mail [bandali@gnu.org](mailto:bandali@gnu.org?subject=Comment%20for%20EmacsConf%202023%20gnus%3A%20Reading%20and%20writing%20emails%20in%20GNU%20Emacs%20with%20Gnus)
+
+----
+Got an idea for an EmacsConf talk or session? We'd love to hear from you! Check out the [[Call for Participation|/2025/cfp]] for details.
+
+
+<!-- End of emacsconf-publish-after-page -->
diff --git a/2025/info/gnus-before.md b/2025/info/gnus-before.md
new file mode 100644
index 00000000..934ba044
--- /dev/null
+++ b/2025/info/gnus-before.md
@@ -0,0 +1,12 @@
+<!-- Automatically generated by emacsconf-publish-before-page -->
+[[!toc  ]]
+Format: 20-min talk			; Q&A: ask questions via Etherpad/IRC; we'll e-mail the speaker and post answers on this wiki page after the conference  
+Status: Waiting for video from speaker  
+
+
+
+
+
+
+# Description
+<!-- End of emacsconf-publish-before-page -->
+\ No newline at end of file
diff --git a/2025/info/gnus-nav.md b/2025/info/gnus-nav.md
new file mode 100644
index 00000000..8c223c88
--- /dev/null
+++ b/2025/info/gnus-nav.md
@@ -0,0 +1,7 @@
+
+<div class="talk-nav">
+Back to the [[talks]]  
+Previous by track: <a href="/2025/talks/reader">An introduction to the Emacs Reader</a>  
+Next by track: <a href="/2025/talks/python">Interactive Python development in Emacs</a>  
+Track: <span class="sched-track General">General</span>  
+</div>
diff --git a/2025/info/python-nav.md b/2025/info/python-nav.md
index 1bd2101c..5ac639f9 100644
--- a/2025/info/python-nav.md
+++ b/2025/info/python-nav.md
@@ -1,7 +1,7 @@
 
 <div class="talk-nav">
 Back to the [[talks]]  
-Previous by track: <a href="/2025/talks/reader">An introduction to the Emacs Reader</a>  
+Previous by track: <a href="/2025/talks/gnus">Reading and writing emails in GNU Emacs with Gnus</a>  
 Next by track: <a href="/2025/talks/swanky">Swanky Python: Interactive development for Python</a>  
 Track: <span class="sched-track Development">Development</span>  
 </div>
diff --git a/2025/info/reader-nav.md b/2025/info/reader-nav.md
index cc2aeb8b..befe7d06 100644
--- a/2025/info/reader-nav.md
+++ b/2025/info/reader-nav.md
@@ -2,6 +2,6 @@
 <div class="talk-nav">
 Back to the [[talks]]  
 Previous by track: <a href="/2025/talks/gardening">Gardening in Emacs: A Windows user's tale of tending, tweaking, and triumph</a>  
-Next by track: <a href="/2025/talks/python">Interactive Python development in Emacs</a>  
+Next by track: <a href="/2025/talks/gnus">Reading and writing emails in GNU Emacs with Gnus</a>  
 Track: <span class="sched-track General">General</span>  
 </div>
diff --git a/2025/schedule-details.md b/2025/schedule-details.md
index b5797a96..c5b1f347 100644
--- a/2025/schedule-details.md
+++ b/2025/schedule-details.md
@@ -1,6 +1,6 @@
 Jump to: <a href="#dev">Development</a>
 
-<h1 id="gen" class="sched-track General">General (12 talks)</h1>
+<h1 id="gen" class="sched-track General">General (13 talks)</h1>
 [[!template id=sched title="""Emacs as a fully-fledged reference manager""" url="""/2025/talks/reference""" speakers="""Vidianos Giannitsis""" watch="""https://emacsconf.org/2025/watch/gen""" slug="""reference""" note=""""""]]
 [[!template id=sched title="""An enhanced bibliography in org-mode for scientific research and self-directed learning""" url="""/2025/talks/bibliography""" speakers="""Blaine Mooers""" watch="""https://emacsconf.org/2025/watch/gen""" slug="""bibliography""" note=""""""]]
 [[!template id=sched title="""From FRDCSA to FLP2: Building AI-Powered Life Planning Systems in Emacs - A Journey from Research to Real-World Impact""" url="""/2025/talks/life""" speakers="""Andrew John Dougherty""" watch="""https://emacsconf.org/2025/watch/gen""" slug="""life""" note=""""""]]
@@ -9,6 +9,7 @@ Jump to: <a href="#dev">Development</a>
 [[!template id=sched title="""corfu+yasnippet: Easier than I thought""" url="""/2025/talks/completion""" speakers="""Pedro A. Aranda Gutiérrez""" watch="""https://emacsconf.org/2025/watch/gen""" slug="""completion""" note=""""""]]
 [[!template id=sched title="""Gardening in Emacs: A Windows user's tale of tending, tweaking, and triumph""" url="""/2025/talks/gardening""" speakers="""Marco Bresciani""" watch="""https://emacsconf.org/2025/watch/gen""" slug="""gardening""" note=""""""]]
 [[!template id=sched title="""An introduction to the Emacs Reader""" url="""/2025/talks/reader""" speakers="""Divyá""" slug="""reader""" note=""""""]]
+[[!template id=sched title="""Reading and writing emails in GNU Emacs with Gnus""" url="""/2025/talks/gnus""" speakers="""Amin Bandali""" watch="""https://emacsconf.org/2025/watch/gen""" slug="""gnus""" note=""""""]]
 [[!template id=sched title="""Saturday opening remarks""" url="""/2025/talks/sat-open""" watch="""https://emacsconf.org/2025/watch/gen""" slug="""sat-open""" note=""""""]]
 [[!template id=sched title="""Saturday closing remarks""" url="""/2025/talks/sat-close""" watch="""https://emacsconf.org/2025/watch/gen""" slug="""sat-close""" note=""""""]]
 [[!template id=sched title="""Sunday opening remarks""" url="""/2025/talks/sun-open""" watch="""https://emacsconf.org/2025/watch/gen""" slug="""sun-open""" note=""""""]]
diff --git a/2025/talks/gnus.md b/2025/talks/gnus.md
new file mode 100644
index 00000000..155bd9e0
--- /dev/null
+++ b/2025/talks/gnus.md
@@ -0,0 +1,44 @@
+[[!meta title="Reading and writing emails in GNU Emacs with Gnus"]]
+[[!meta copyright="Copyright &copy; 2025 Amin Bandali"]]
+[[!inline pages="internal(2025/info/gnus-nav)" raw="yes"]]
+
+<!-- Initially generated with emacsconf-publish-talk-page and then left alone for manual editing -->
+<!-- You can manually edit this file to update the abstract, add links, etc. --->
+
+
+# Reading and writing emails in GNU Emacs with Gnus
+Amin Bandali (he/him) - IRC: bandali, <https://kelar.org/~bandali>, <mailto:bandali@gnu.org>
+
+[[!inline pages="internal(2025/info/gnus-before)" raw="yes"]]
+
+Gnus has had the reputation of being difficult to grasp and
+configure.  The myriad of configuration options of its many major
+and minor modes which afford Gnus its high degree of customizability
+can also seem overwhelming and daunting for folks looking to learn
+about and use it to build a workflow for doing email in GNU Emacs.
+
+This talk aims to provide a high-level outline of some of the key
+concepts in Gnus, and a roadmap for approaching and configuring Gnus
+and Message to your liking so that you, too, can read, compose, and
+send emails with GNU Emacs.
+
+About the speaker:
+
+Amin Bandali is a computing scientist and activist for user freedom,
+and a participant in various free software projects and communities.
+Bandali wears a few hats around the GNU Project and is a volunteer
+member of the Free Software Foundation SysOps team, a core organizer
+of EmacsConf, a Debian Developer and a contributor to the Trisquel
+GNU/Linux distribution.
+
+In this talk, Bandali will go over configuring Gnus and Message for
+reading and composing emails, showcasing one of many approaches for
+using GNU Emacs for email communications.
+
+
+
+[[!inline pages="internal(2025/info/gnus-after)" raw="yes"]]
+
+[[!inline pages="internal(2025/info/gnus-nav)" raw="yes"]]
+
+
diff --git a/organizers-notebook/index.org b/organizers-notebook/index.org
index f048dba2..4c25585b 100644
--- a/organizers-notebook/index.org
+++ b/organizers-notebook/index.org
@@ -687,7 +687,7 @@ Resize disk to 25GB, copying large files to media if needed
 Before the conference:
 
 1. Set ~upload_enabled~ to ~true~ in ~prod-vars.yml~ and run ~ansible-playbook -i inventory.yml prod-playbook.yml --tags upload~.
-2. Confirm that https://upload.emacsconf.org has the upload interface and works with the password.
+2. Confirm that https://upload.emacsconf.org has the upload interface and works with the password. If it's not up yet, use ~sudo service upload start~.
 3. Use ~emacsconf-mail-template-to-all-groups~ and ~emacsconf-mail-upload-and-backstage-info~ to e-mail the upload information to all speakers.
 
 After the conference: