diff --git a/README.md b/README.md
index 834a925..6648b59 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,6 @@ Szkielet komponentu Joomla 6 do gromadzenia pytań testowych.
 
 ## Instalacja
 
-W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.9.4).
+W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.10.0).
 
 Po instalacji komponent jest dostępny w panelu administratora jako **Pytania testowe**.
diff --git a/administrator/components/com_testquestions/forms/set.xml b/administrator/components/com_testquestions/forms/set.xml
index 86c558d..2297e59 100644
--- a/administrator/components/com_testquestions/forms/set.xml
+++ b/administrator/components/com_testquestions/forms/set.xml
@@ -3,6 +3,9 @@
     <fieldset name="details">
         <field name="id" type="hidden" />
         <field name="title" type="text" label="COM_TESTQUESTIONS_SET_TITLE" required="true" maxlength="255" />
+        <field name="subject_id" type="sql" label="COM_TESTQUESTIONS_SUBJECT" required="true" query="SELECT id, title FROM #__testquestions_subjects WHERE published = 1 ORDER BY title ASC" key_field="id" value_field="title" translate_query="false">
+            <option value="0">COM_TESTQUESTIONS_SELECT_SUBJECT</option>
+        </field>
         <field name="description" type="textarea" label="COM_TESTQUESTIONS_SET_DESCRIPTION" rows="4" filter="raw" />
         <field name="published" type="list" label="JSTATUS" default="1">
             <option value="1">JPUBLISHED</option>
diff --git a/administrator/components/com_testquestions/forms/subject.xml b/administrator/components/com_testquestions/forms/subject.xml
new file mode 100644
index 0000000..cd858de
--- /dev/null
+++ b/administrator/components/com_testquestions/forms/subject.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+    <fieldset name="details">
+        <field name="id" type="hidden" />
+        <field name="title" type="text" label="COM_TESTQUESTIONS_SUBJECT_TITLE" required="true" maxlength="150" />
+        <field name="published" type="list" label="JSTATUS" default="1">
+            <option value="1">JPUBLISHED</option>
+            <option value="0">JUNPUBLISHED</option>
+        </field>
+    </fieldset>
+</form>
diff --git a/administrator/components/com_testquestions/language/en-GB/com_testquestions.ini b/administrator/components/com_testquestions/language/en-GB/com_testquestions.ini
index 5377d99..c0c3084 100644
--- a/administrator/components/com_testquestions/language/en-GB/com_testquestions.ini
+++ b/administrator/components/com_testquestions/language/en-GB/com_testquestions.ini
@@ -57,3 +57,9 @@ COM_TESTQUESTIONS_SET_CATEGORY_FILTER="Filtruj pytania według kategorii"
 COM_TESTQUESTIONS_SET_ALL_CATEGORIES="Wszystkie kategorie"
 COM_TESTQUESTIONS_UNCATEGORIZED="Bez kategorii"
 COM_TESTQUESTIONS_SET_SHOW_DETAILS="Pokaż odpowiedzi"
+COM_TESTQUESTIONS_SUBJECTS="Przedmioty"
+COM_TESTQUESTIONS_SUBJECT="Przedmiot"
+COM_TESTQUESTIONS_SUBJECT_TITLE="Nazwa przedmiotu"
+COM_TESTQUESTIONS_NEW_SUBJECT="Nowy przedmiot"
+COM_TESTQUESTIONS_EDIT_SUBJECT="Edytuj przedmiot"
+COM_TESTQUESTIONS_SELECT_SUBJECT="-- wybierz przedmiot --"
diff --git a/administrator/components/com_testquestions/sql/install.mysql.utf8mb4.sql b/administrator/components/com_testquestions/sql/install.mysql.utf8mb4.sql
index 74b9617..5728d6e 100644
--- a/administrator/components/com_testquestions/sql/install.mysql.utf8mb4.sql
+++ b/administrator/components/com_testquestions/sql/install.mysql.utf8mb4.sql
@@ -40,6 +40,7 @@ VALUES (1, 'Bez kategorii', 1, 0);
 
 CREATE TABLE IF NOT EXISTS `#__testquestions_sets` (
   `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `subject_id` int unsigned NOT NULL DEFAULT 0,
   `title` varchar(255) NOT NULL,
   `description` text NULL,
   `published` tinyint NOT NULL DEFAULT 1,
@@ -53,6 +54,15 @@ CREATE TABLE IF NOT EXISTS `#__testquestions_sets` (
   KEY `idx_ordering` (`ordering`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
 
+CREATE TABLE IF NOT EXISTS `#__testquestions_subjects` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `title` varchar(150) NOT NULL,
+  `published` tinyint NOT NULL DEFAULT 1,
+  `ordering` int NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `idx_title` (`title`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
+
 CREATE TABLE IF NOT EXISTS `#__testquestions_set_questions` (
   `set_id` int unsigned NOT NULL,
   `question_id` int unsigned NOT NULL,
diff --git a/administrator/components/com_testquestions/sql/uninstall.mysql.utf8mb4.sql b/administrator/components/com_testquestions/sql/uninstall.mysql.utf8mb4.sql
index 010f238..b555188 100644
--- a/administrator/components/com_testquestions/sql/uninstall.mysql.utf8mb4.sql
+++ b/administrator/components/com_testquestions/sql/uninstall.mysql.utf8mb4.sql
@@ -1,3 +1,4 @@
 DROP TABLE IF EXISTS `#__testquestions_set_questions`;
 DROP TABLE IF EXISTS `#__testquestions_sets`;
+DROP TABLE IF EXISTS `#__testquestions_subjects`;
 DROP TABLE IF EXISTS `#__testquestions_questions`;
diff --git a/administrator/components/com_testquestions/sql/updates/mysql/1.10.0.sql b/administrator/components/com_testquestions/sql/updates/mysql/1.10.0.sql
new file mode 100644
index 0000000..99dd598
--- /dev/null
+++ b/administrator/components/com_testquestions/sql/updates/mysql/1.10.0.sql
@@ -0,0 +1,11 @@
+CREATE TABLE IF NOT EXISTS `#__testquestions_subjects` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `title` varchar(150) NOT NULL,
+  `published` tinyint NOT NULL DEFAULT 1,
+  `ordering` int NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `idx_title` (`title`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
+
+ALTER TABLE `#__testquestions_sets`
+  ADD COLUMN `subject_id` int unsigned NOT NULL DEFAULT 0 AFTER `id`;
diff --git a/administrator/components/com_testquestions/sql/updates/mysql/1.9.0.sql b/administrator/components/com_testquestions/sql/updates/mysql/1.9.0.sql
index e5c7348..a89489c 100644
--- a/administrator/components/com_testquestions/sql/updates/mysql/1.9.0.sql
+++ b/administrator/components/com_testquestions/sql/updates/mysql/1.9.0.sql
@@ -1,5 +1,6 @@
 CREATE TABLE IF NOT EXISTS `#__testquestions_sets` (
   `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `subject_id` int unsigned NOT NULL DEFAULT 0,
   `title` varchar(255) NOT NULL,
   `description` text NULL,
   `published` tinyint NOT NULL DEFAULT 1,
@@ -13,6 +14,15 @@ CREATE TABLE IF NOT EXISTS `#__testquestions_sets` (
   KEY `idx_ordering` (`ordering`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
 
+CREATE TABLE IF NOT EXISTS `#__testquestions_subjects` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `title` varchar(150) NOT NULL,
+  `published` tinyint NOT NULL DEFAULT 1,
+  `ordering` int NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `idx_title` (`title`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
+
 CREATE TABLE IF NOT EXISTS `#__testquestions_set_questions` (
   `set_id` int unsigned NOT NULL,
   `question_id` int unsigned NOT NULL,
diff --git a/administrator/components/com_testquestions/src/Controller/SubjectController.php b/administrator/components/com_testquestions/src/Controller/SubjectController.php
new file mode 100644
index 0000000..a911a92
--- /dev/null
+++ b/administrator/components/com_testquestions/src/Controller/SubjectController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\Controller;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\MVC\Controller\FormController;
+
+class SubjectController extends FormController
+{
+    protected $view_item = 'subject';
+    protected $view_list = 'subjects';
+
+    public function cancel($key = null)
+    {
+        $this->setRedirect('index.php?option=com_testquestions&view=subjects');
+
+        return true;
+    }
+}
diff --git a/administrator/components/com_testquestions/src/Controller/SubjectsController.php b/administrator/components/com_testquestions/src/Controller/SubjectsController.php
new file mode 100644
index 0000000..c5d34d9
--- /dev/null
+++ b/administrator/components/com_testquestions/src/Controller/SubjectsController.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\Controller;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\MVC\Controller\AdminController;
+
+class SubjectsController extends AdminController
+{
+    protected $text_prefix = 'COM_TESTQUESTIONS';
+
+    public function getModel($name = 'Subject', $prefix = 'Administrator', $config = ['ignore_request' => true])
+    {
+        return parent::getModel($name, $prefix, $config);
+    }
+}
diff --git a/administrator/components/com_testquestions/src/Model/SetsModel.php b/administrator/components/com_testquestions/src/Model/SetsModel.php
index d294181..2afa656 100644
--- a/administrator/components/com_testquestions/src/Model/SetsModel.php
+++ b/administrator/components/com_testquestions/src/Model/SetsModel.php
@@ -20,8 +20,9 @@ class SetsModel extends ListModel
     {
         $db = Factory::getContainer()->get('DatabaseDriver');
         $query = $db->getQuery(true)
-            ->select(['s.*', 'COUNT(sq.question_id) AS question_count'])
+            ->select(['s.*', 'sub.title AS subject_title', 'COUNT(sq.question_id) AS question_count'])
             ->from($db->quoteName('#__testquestions_sets', 's'))
+            ->leftJoin($db->quoteName('#__testquestions_subjects', 'sub') . ' ON sub.id = s.subject_id')
             ->leftJoin($db->quoteName('#__testquestions_set_questions', 'sq') . ' ON sq.set_id = s.id')
             ->group('s.id');
 
diff --git a/administrator/components/com_testquestions/src/Model/SubjectModel.php b/administrator/components/com_testquestions/src/Model/SubjectModel.php
new file mode 100644
index 0000000..208c937
--- /dev/null
+++ b/administrator/components/com_testquestions/src/Model/SubjectModel.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\Model;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\Model\AdminModel;
+
+class SubjectModel extends AdminModel
+{
+    public function getTable($name = 'Subject', $prefix = 'Administrator', $config = [])
+    {
+        return $this->getMVCFactory()->createTable($name, $prefix, $config);
+    }
+
+    public function getForm($data = [], $loadData = true)
+    {
+        return $this->loadForm('com_testquestions.subject', 'subject', ['control' => 'jform', 'load_data' => $loadData]);
+    }
+
+    protected function loadFormData()
+    {
+        return Factory::getApplication()->getUserState('com_testquestions.edit.subject.data', []) ?: $this->getItem();
+    }
+}
diff --git a/administrator/components/com_testquestions/src/Model/SubjectsModel.php b/administrator/components/com_testquestions/src/Model/SubjectsModel.php
new file mode 100644
index 0000000..c282126
--- /dev/null
+++ b/administrator/components/com_testquestions/src/Model/SubjectsModel.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\Model;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\Model\ListModel;
+
+class SubjectsModel extends ListModel
+{
+    protected function getListQuery()
+    {
+        $db = Factory::getContainer()->get('DatabaseDriver');
+
+        return $db->getQuery(true)
+            ->select('*')
+            ->from($db->quoteName('#__testquestions_subjects'))
+            ->order($db->quoteName('ordering') . ' ASC, ' . $db->quoteName('title') . ' ASC');
+    }
+}
diff --git a/administrator/components/com_testquestions/src/Table/SubjectTable.php b/administrator/components/com_testquestions/src/Table/SubjectTable.php
new file mode 100644
index 0000000..102fe41
--- /dev/null
+++ b/administrator/components/com_testquestions/src/Table/SubjectTable.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\Table;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Table\Table;
+use Joomla\Database\DatabaseDriver;
+
+class SubjectTable extends Table
+{
+    public function __construct(DatabaseDriver $db)
+    {
+        parent::__construct('#__testquestions_subjects', 'id', $db);
+    }
+
+    public function check($updateNulls = false): bool
+    {
+        $this->title = trim((string) $this->title);
+
+        return $this->title !== '' && parent::check($updateNulls);
+    }
+}
diff --git a/administrator/components/com_testquestions/src/View/Sets/HtmlView.php b/administrator/components/com_testquestions/src/View/Sets/HtmlView.php
index 44e924e..ac8c40c 100644
--- a/administrator/components/com_testquestions/src/View/Sets/HtmlView.php
+++ b/administrator/components/com_testquestions/src/View/Sets/HtmlView.php
@@ -50,5 +50,10 @@ class HtmlView extends BaseHtmlView
             'COM_TESTQUESTIONS_QUESTIONS',
             'list'
         );
+        ToolbarHelper::link(
+            'index.php?option=com_testquestions&view=subjects',
+            'COM_TESTQUESTIONS_SUBJECTS',
+            'list'
+        );
     }
 }
diff --git a/administrator/components/com_testquestions/src/View/Subject/HtmlView.php b/administrator/components/com_testquestions/src/View/Subject/HtmlView.php
new file mode 100644
index 0000000..09fa224
--- /dev/null
+++ b/administrator/components/com_testquestions/src/View/Subject/HtmlView.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\View\Subject;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+use Joomla\CMS\Toolbar\ToolbarHelper;
+
+class HtmlView extends BaseHtmlView
+{
+    protected $form;
+    protected $item;
+
+    public function display($tpl = null)
+    {
+        $this->form = $this->get('Form');
+        $this->item = $this->get('Item');
+        ToolbarHelper::title($this->item->id ? Text::_('COM_TESTQUESTIONS_EDIT_SUBJECT') : Text::_('COM_TESTQUESTIONS_NEW_SUBJECT'));
+        ToolbarHelper::save('subject.save', 'JTOOLBAR_SAVE');
+        ToolbarHelper::cancel('subject.cancel', 'JTOOLBAR_CANCEL');
+
+        return parent::display($tpl);
+    }
+}
diff --git a/administrator/components/com_testquestions/src/View/Subjects/HtmlView.php b/administrator/components/com_testquestions/src/View/Subjects/HtmlView.php
new file mode 100644
index 0000000..b10d659
--- /dev/null
+++ b/administrator/components/com_testquestions/src/View/Subjects/HtmlView.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\View\Subjects;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+use Joomla\CMS\Toolbar\ToolbarHelper;
+
+class HtmlView extends BaseHtmlView
+{
+    protected $items;
+
+    public function display($tpl = null)
+    {
+        $this->items = $this->get('Items');
+        ToolbarHelper::title(Text::_('COM_TESTQUESTIONS_SUBJECTS'));
+        ToolbarHelper::addNew('subject.add', 'JTOOLBAR_NEW');
+        ToolbarHelper::editList('subject.edit', 'JTOOLBAR_EDIT');
+        ToolbarHelper::deleteList('', 'subjects.delete', 'JTOOLBAR_DELETE');
+        ToolbarHelper::link('index.php?option=com_testquestions&view=sets', 'COM_TESTQUESTIONS_SETS', 'back');
+
+        return parent::display($tpl);
+    }
+}
diff --git a/administrator/components/com_testquestions/tmpl/sets/default.php b/administrator/components/com_testquestions/tmpl/sets/default.php
index 904191b..c256718 100644
--- a/administrator/components/com_testquestions/tmpl/sets/default.php
+++ b/administrator/components/com_testquestions/tmpl/sets/default.php
@@ -30,6 +30,7 @@ HTMLHelper::_('behavior.multiselect');
             <tr>
                 <th scope="col" class="w-1"><?php echo HTMLHelper::_('grid.checkall'); ?></th>
                 <th scope="col"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_TITLE'); ?></th>
+                <th scope="col"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SUBJECT'); ?></th>
                 <th scope="col" class="w-15"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_QUESTION_COUNT'); ?></th>
                 <th scope="col" class="w-15"><?php echo \Joomla\CMS\Language\Text::_('JSTATUS'); ?></th>
                 <th scope="col" class="w-10"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_COLUMN_ID'); ?></th>
@@ -40,6 +41,7 @@ HTMLHelper::_('behavior.multiselect');
             <tr>
                 <td><?php echo HTMLHelper::_('grid.id', $i, $item->id); ?></td>
                 <th scope="row"><a href="<?php echo Route::_('index.php?option=com_testquestions&task=set.edit&id=' . (int) $item->id); ?>"><?php echo $this->escape($item->title); ?></a></th>
+                <td><?php echo $this->escape($item->subject_title ?: '—'); ?></td>
                 <td><?php echo (int) $item->question_count; ?></td>
                 <td><?php echo HTMLHelper::_('jgrid.published', $item->published, $i, 'sets.', true, 'cb'); ?></td>
                 <td><?php echo (int) $item->id; ?></td>
diff --git a/administrator/components/com_testquestions/tmpl/subject/edit.php b/administrator/components/com_testquestions/tmpl/subject/edit.php
new file mode 100644
index 0000000..ddb3812
--- /dev/null
+++ b/administrator/components/com_testquestions/tmpl/subject/edit.php
@@ -0,0 +1,8 @@
+<?php defined('_JEXEC') or die; ?>
+<form action="index.php?option=com_testquestions&layout=edit&id=<?php echo (int) $this->item->id; ?>" method="post" name="adminForm" id="subject-form">
+    <?php echo $this->form->renderField('title'); ?>
+    <?php echo $this->form->renderField('published'); ?>
+    <?php echo $this->form->renderField('id'); ?>
+    <input type="hidden" name="task" value="subject.save">
+    <?php echo Joomla\CMS\HTML\HTMLHelper::_('form.token'); ?>
+</form>
diff --git a/administrator/components/com_testquestions/tmpl/subjects/default.php b/administrator/components/com_testquestions/tmpl/subjects/default.php
new file mode 100644
index 0000000..b1884d9
--- /dev/null
+++ b/administrator/components/com_testquestions/tmpl/subjects/default.php
@@ -0,0 +1,24 @@
+<?php defined('_JEXEC') or die; ?>
+<form action="index.php?option=com_testquestions&view=subjects" method="post" name="adminForm" id="adminForm">
+    <table class="table table-striped">
+        <thead><tr>
+            <th><?php echo Joomla\CMS\HTML\HTMLHelper::_('grid.checkall'); ?></th>
+            <th><?php echo Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SUBJECT_TITLE'); ?></th>
+            <th><?php echo Joomla\CMS\Language\Text::_('JSTATUS'); ?></th>
+            <th><?php echo Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_COLUMN_ID'); ?></th>
+        </tr></thead>
+        <tbody>
+        <?php foreach ($this->items as $i => $item) : ?>
+            <tr>
+                <td><?php echo Joomla\CMS\HTML\HTMLHelper::_('grid.id', $i, $item->id); ?></td>
+                <th><a href="index.php?option=com_testquestions&task=subject.edit&id=<?php echo (int) $item->id; ?>"><?php echo htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8'); ?></a></th>
+                <td><?php echo $item->published ? Joomla\CMS\Language\Text::_('JPUBLISHED') : Joomla\CMS\Language\Text::_('JUNPUBLISHED'); ?></td>
+                <td><?php echo (int) $item->id; ?></td>
+            </tr>
+        <?php endforeach; ?>
+        </tbody>
+    </table>
+    <input type="hidden" name="boxchecked" value="0">
+    <input type="hidden" name="task" value="">
+    <?php echo Joomla\CMS\HTML\HTMLHelper::_('form.token'); ?>
+</form>
diff --git a/com_testquestions.xml b/com_testquestions.xml
index 4046251..453ac89 100644
--- a/com_testquestions.xml
+++ b/com_testquestions.xml
@@ -4,7 +4,7 @@
     <creationDate>2026-10-14</creationDate>
     <author>Komponent</author>
     <license>GNU General Public License version 2 or later</license>
-    <version>1.9.4</version>
+    <version>1.10.0</version>
     <description>COM_TESTQUESTIONS_DESCRIPTION</description>
     <element>com_testquestions</element>
     <namespace path="src">Komponent\Component\Testquestions</namespace>