diff --git a/.gitignore b/.gitignore
index a859577..3aa373c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,3 +46,5 @@
 /results_emacs/
 /emacs-30.1.tar.xz
 /emacs-30.1.tar.xz.sig
+/emacs-30.2.tar.xz
+/emacs-30.2.tar.xz.sig
diff --git a/emacs.spec b/emacs.spec
index ad9b9b6..00d464b 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -8,7 +8,7 @@
 Summary:       GNU Emacs text editor
 Name:          emacs
 Epoch:         1
-Version:       30.1
+Version:       30.2
 Release:       %autorelease
 License:       GPL-3.0-or-later AND CC0-1.0
 URL:           https://www.gnu.org/software/emacs/
@@ -26,6 +26,9 @@ Source102:     https://keys.openpgp.org/vks/v1/by-fingerprint/12BB9B400EE3F77282
 Source4:       dotemacs.el
 Source5:       site-start.el
 Source6:       default.el
+# Emacs Terminal Mode, #551949, #617355
+Source7:       emacs-terminal.desktop
+Source8:       emacs-terminal.sh
 Source9:       emacs-desktop.sh
 
 # Avoid trademark issues
@@ -126,6 +129,7 @@ Requires(posttrans): /usr/sbin/alternatives
 Requires:      emacs-common = %{epoch}:%{version}-%{release}
 Requires:      libpixbufloader-xpm.so%{?marker}
 Provides:      emacs(bin) = %{epoch}:%{version}-%{release}
+Provides:      emacs-pgtk = %{epoch}:%{version}-%{release}
 Supplements:   ((libwayland-server and emacs-common) unless emacs-nw)
 
 %define site_lisp %{_datadir}/emacs/site-lisp
@@ -200,9 +204,7 @@ support, for running on a terminal only.
 
 %package -n emacsclient
 Summary:       Remotely control GNU Emacs
-
-# This is a moving target whilst Fedora 40 is still receivng updates:
-Conflicts:     emacs-common < %{epoch}:%{version}-%{release}
+Conflicts:     emacs-common < 1:29.4-12
 
 %description -n emacsclient
 %desc
@@ -221,7 +223,7 @@ Requires:      /usr/bin/readlink
 Requires:      %{name}-filesystem
 Requires:      emacsclient
 Requires:      libgccjit
-Recommends:    (emacs or emacs-gtk+x11 or emacs-lucid or emacs-nw)
+Recommends:    emacs(bin)
 Recommends:    enchant2
 Recommends:    info
 Provides:      %{name}-el = %{epoch}:%{version}-%{release}
@@ -246,6 +248,20 @@ This package contains all the common files needed by emacs, emacs-gtk+x11,
 emacs-lucid, or emacs-nw.
 
 
+
+%package terminal
+Summary:       A desktop menu item for GNU Emacs terminal.
+Requires:      (emacs or emacs-gtk+x11 or emacs-lucid)
+BuildArch:     noarch
+
+%description terminal
+Contains a desktop menu item running GNU Emacs terminal. Install
+emacs-terminal if you need a terminal with Malayalam support.
+
+Please note that emacs-terminal is a temporary package and it will be
+removed when another terminal becomes capable of handling Malayalam.
+
+
 %package devel
 Summary: Development header files for Emacs
 
@@ -504,9 +520,16 @@ install -p -m 0644 emacs.pc %{buildroot}/%{pkgconfig}
 mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d
 install -p -m 0644 macros.emacs %{buildroot}%{_rpmconfigdir}/macros.d/
 
+# Installing emacs-terminal binary
+install -p -m 755 %SOURCE8 %{buildroot}%{_bindir}/emacs-terminal
+
 # After everything is installed, remove info dir
 rm -f %{buildroot}%{_infodir}/dir
 
+# Install desktop files
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications \
+                     %SOURCE7
+
 # Install a wrapper to avoid running the Wayland-only build on X11
 install -p -m 0755 %SOURCE9 %{buildroot}%{_bindir}/emacs-desktop
 
@@ -660,7 +683,7 @@ if [ $1 = 0 ]; then
 fi
 
 %posttrans nw
-/usr/sbin/alternatives --install %{_bindir}/emacs emacs %{_bindir}/emacs-nw 70 || :
+/usr/sbin/alternatives --install %{_bindir}/emacs emacs %{_bindir}/emacs-nw 65 || :
 # The preun scriptlet of packages before 29.4-5 will remove this symlink
 # after it has been installed, so we may need to put it back:
 if [ $1 = 2 -a ! -h %{_bindir}/emacs-nw ]; then
@@ -749,8 +772,13 @@ fi
 %attr(0644,root,root) %config %{site_lisp}/site-start.el
 %{pkgconfig}/emacs.pc
 
+%files terminal
+%{_bindir}/emacs-terminal
+%{_datadir}/applications/emacs-terminal.desktop
+
 %files devel
 %{_includedir}/emacs-module.h
 
+
 %changelog
 %autochangelog
diff --git a/sources b/sources
index 11bd85d..37f14cc 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (emacs-30.1.tar.xz) = 511a6a1d2a170a207913692e1349344b70a0b5202b8d1ae27dc7256e589c77ae9e35da16fc2a098bf9f1b8d0f60233f452ed8d6744b70b907f3484c42f2d7d7f
-SHA512 (emacs-30.1.tar.xz.sig) = 59ef724ff765fb76b9b9cfb8bd3853e001e9e6cefa65e2c49822238c11d619f916284f5b118cefff1bcd6c70f4ebcc1e420754cc225002164b56ced3caa954bd
+SHA512 (emacs-30.2.tar.xz) = 313432d11e95c74f8cd35c5b1da442e6223f5d40f9173c55883c0339ecbfb97a0bedf79177ef8902afd3e33c078a233777bed01f5caffa1e7524f17d58bfc9a2
+SHA512 (emacs-30.2.tar.xz.sig) = ab5b5d0624b37ac662cf9914e8807fc37ee273c107f1a19ca75a527b6b9a85ce35f9436d03d8a988876cce7e7bebcc6c4a1251b0ceb08785b56bf42743f246e1